Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue

@@ -209,7 +209,10 @@ export default {
       this.multipleSelection = row
       row.forEach(element => {
         aa.push(element.salesOrderSid)
-        bb.push(element.builded)
+        bb.push({
+          builded: element.builded,
+          bankContractNo: element.bankContractNo
+        })
       })
       this.sids = aa
       this.state_list = bb
@@ -274,8 +277,8 @@ export default {
         // }
         if (this.state_list.length > 0) {
           for (var i = 0; i < this.state_list.length; i++) {
-            if (this.state_list[i] === '是') {
-              this.$message({ showClose: true, type: 'error', message: '请选择是否已生成还款计划表状态为否的记录进行操作' })
+            if (this.state_list[i].bankContractNo === '' || this.state_list[i].builded === '是') {
+              this.$message({ showClose: true, type: 'error', message: '请选择是否已生成还款计划表状态为否且资方合同编号不为空的记录进行操作' })
               return
             }
           }

doc/databases/yxt-as.sql

@@ -176,7 +176,6 @@ CREATE TABLE `as_busclaim_invoice_bill`
     `createOrgSid`   varchar(64)          DEFAULT NULL COMMENT '创建组织sid',
     `useOrgSid`      varchar(64)          DEFAULT NULL COMMENT '使用组织sid',
     `useOrgName`     varchar(64)          DEFAULT NULL COMMENT '分公司',
-    `orgSidPath`     text                 DEFAULT NULL COMMENT '组织全路径sid',
     `closeDate`      varchar(64)          DEFAULT NULL COMMENT '办结日期',
     `procInstId`     varchar(64)          DEFAULT NULL COMMENT '实例id',
     `procDefId`      varchar(64)          DEFAULT NULL COMMENT '流程定义id',

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@@ -24,6 +24,8 @@ import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo;
 import com.yxt.anrui.as.feign.message.MessageFeign;
 import com.yxt.anrui.as.feign.message.MessageFlowVo;
 import com.yxt.anrui.as.feign.message.MessageFlowableQuery;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -74,6 +76,9 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
     @Autowired
     private FlowableFeign flowableFeign;
 
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
     public PagerVo<AsBusclaimInvoiceBillVo> listPage(PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) {
         AsBusclaimInvoiceBillQuery query = pagerQuery.getParams();
         QueryWrapper<AsBusclaimInvoiceBill> qw = new QueryWrapper<>();
@@ -123,7 +128,6 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         if (StringUtils.isBlank(sid)) {
             AsBusclaimInvoiceBill asBusclaimInvoiceBill = new AsBusclaimInvoiceBill();
             BeanUtil.copyProperties(dto, asBusclaimInvoiceBill, "sid");
-//            asBusclaimInvoiceBill.setOrgSidPath(dto.getOrgPath());
             asBusclaimInvoiceBill.setCreateBySid(dto.getCreateBySid());
             sid = asBusclaimInvoiceBill.getSid();
             List<String> fileList = dto.getFileList();
@@ -220,7 +224,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         //用户的部门全路径sid
-//        bv.setOrgSidPath(asBusclaimInvoiceBill.getOrgSidPath());
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getCreateDeptSid()).getData();
+        if (sysOrganization != null) {
+            bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+        }
         bv.setBusinessSid(businessSid);
         bv.setUserSid(dto.getCreateBySid());
         bv.setFormVariables(variables);
@@ -309,7 +316,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         bv.setFormVariables(variables);
-//        bv.setOrgSidPath(asBusclaimInvoiceBill.getOrgSidPath());
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getCreateDeptSid()).getData();
+        if (sysOrganization != null) {
+            bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+        }
         bv.setModelId(asBusclaimInvoiceBill.getProcDefId());
         if (bv.getTaskId().equals(asBusclaimInvoiceBill.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java

@@ -218,6 +218,9 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
         GoodsSkuQuery query = pagerQuery.getParams();
         QueryWrapper<BaseGoodsSku> qw = new QueryWrapper<>();
         if (query != null) {
+            if (StringUtils.isNotBlank(query.getOrgSid())) {
+                qw.eq("spu.useOrgSid", query.getOrgSid());
+            }
             //商品名称
             if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
                 qw.like("spu.goodsName", query.getGoodsSpuName());

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java

@@ -12,6 +12,7 @@ import lombok.Data;
 @Data
 public class GoodsSkuQuery implements Query {
 
+    private static final long serialVersionUID = 7444031420898897515L;
     @ApiModelProperty("分公司sid")
     private String orgSid;
     @ApiModelProperty("商品名称")