财务中心--私有协议应收--应收订单--添加应收增加租户隔离信息

commons/src/main/java/com/jzg/commons/entity/finance/vo/AddReceivableVo.java

@@ -22,4 +22,7 @@ public class AddReceivableVo {
     @Schema(description = "查询")
     private String queryType;
 
+    @Schema(description = "租户代码")
+    private String systemCode;
+
 }

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -77,6 +77,7 @@ public class ReceivableController {
     @Operation(summary = "添加应收记录")
     public HttpResult<String> addReceivable(@RequestBody AddReceivableVo addReceivableVo){
         log.info("添加应收记录：addReceivableVo=[{}]", JSONUtil.toJsonStr(addReceivableVo));
+        addReceivableVo.setSystemCode(baseController.getSystemCode());
         boolean result = receivableService.saveAuditedOrder(addReceivableVo);
         return result ? HttpResult.ok("添加成功") : HttpResult.error("添加失败");
     }

tenant/organization/src/main/java/com/jzg/organization/mapper/ReceivableMapper.java

@@ -40,7 +40,7 @@ public interface ReceivableMapper extends BaseMapper<InsPlyIncome> {
     /**
      * 获取为审核的订单列表
      */
-    List<InsPlyIncome> getUnauditedOrderList(List<String> orderNo, String orderStatus, String auditStatus);
+    List<InsPlyIncome> getUnauditedOrderList(List<String> orderNo, String orderStatus, String auditStatus, String systemCode);
 
     /**
      * 获取应收订单的保司

tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -21,7 +21,7 @@ public interface ReceivableService extends IService<InsPlyIncome> {
     /**
      * 获取未审核的订单列表
      */
-    List<InsPlyIncome> getUnauditOrderList(List<String> orderNo,String orderStatus,String auditStatus);
+    List<InsPlyIncome> getUnauditOrderList(List<String> orderNo, String orderStatus, String auditStatus, String systemCode);
 
     /**
      * 获取为审核的订单

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -152,8 +152,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 //    }
 
     @Override
-    public List<InsPlyIncome> getUnauditOrderList(List<String> orderNo, String orderStatus, String auditStatus) {
-        return baseMapper.getUnauditedOrderList(orderNo, orderStatus, auditStatus);
+    public List<InsPlyIncome> getUnauditOrderList(List<String> orderNo, String orderStatus, String auditStatus, String systemCode) {
+        return baseMapper.getUnauditedOrderList(orderNo, orderStatus, auditStatus, systemCode);
     }
 
     @Override
@@ -172,7 +172,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         if (CollUtil.isEmpty(addReceivableVo.getOrderNo())){
             throw new SystemException("订单号不能为空！");
         }
-        List<InsPlyIncome> auditedOrder = this.getUnauditOrderList(addReceivableVo.getOrderNo(), InsOrderStatusEnum.UNDERWRITED.getCode(), "0");
+        List<InsPlyIncome> auditedOrder = this.getUnauditOrderList(addReceivableVo.getOrderNo(), InsOrderStatusEnum.UNDERWRITED.getCode(), "0", addReceivableVo.getSystemCode());
         AssertionUtils.isEmpty(auditedOrder, "订单不存在");
         // 查看当前表是否已经存在了已审核订单数据
 //        Long count = baseMapper.selectCount(new LambdaQueryWrapper<InsPlyIncome>().eq(InsPlyIncome::getOrderNo, order.getOrderNo()));

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -187,6 +187,7 @@
         LEFT JOIN ins_fee_audit ifa on ifa.order_no = io.id AND ifa.is_delete = 0
         <where>
             io.is_delete = 0
+            and io.system_code = #{systemCode}
             <if test="orderNo != null and orderNo.size > 0">
                 AND io.id in
                 <foreach collection="orderNo" item="id" open="(" separator="," close=")">