核心开立平台拒绝给供应商下所有账号发待办

sc-service/src/main/java/com/huyi/service/common/flowable/controller/FlowableController.java

@@ -959,12 +959,24 @@ public class  FlowableController extends BaseController
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             //先查询需要修改的待办，最后改，放在这改的话，有事务会锁表，后面生成待办就超时
             //盖章待办改为已办
-            LambdaQueryWrapper<SysNotice> queryWrapperA = new LambdaQueryWrapper<>();
-            queryWrapperA.eq(SysNotice::getTableId,zfiId);
-            queryWrapperA.eq(SysNotice::getType,"00");
-            queryWrapperA.eq(SysNotice::getWorkType,"01");
-            queryWrapperA.eq(SysNotice::getStatus,"0");
-            List<SysNotice> noticeList =  sysNoticeService.findSysNotices(queryWrapperA);
+            List<SysNotice> noticeList = new ArrayList<>();
+            //核心企业开立
+            if("1".equals(inf.getZfiCreateType())){
+                LambdaQueryWrapper<SysNotice> queryWrapperA = new LambdaQueryWrapper<>();
+                queryWrapperA.eq(SysNotice::getTableId,zfiId);
+                queryWrapperA.eq(SysNotice::getType,"00");
+                queryWrapperA.eq(SysNotice::getWorkType,"04");
+                queryWrapperA.eq(SysNotice::getStatus,"0");
+                noticeList =  sysNoticeService.findSysNotices(queryWrapperA);
+            }else{
+                //供应商开立或者供应商申请
+                LambdaQueryWrapper<SysNotice> queryWrapperA = new LambdaQueryWrapper<>();
+                queryWrapperA.eq(SysNotice::getTableId,zfiId);
+                queryWrapperA.eq(SysNotice::getType,"00");
+                queryWrapperA.eq(SysNotice::getWorkType,"01");
+                queryWrapperA.eq(SysNotice::getStatus,"0");
+                noticeList =  sysNoticeService.findSysNotices(queryWrapperA);
+            }
             //审批拒绝
             if("delete".equals(state)){
                 //平台审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
@@ -1045,12 +1057,12 @@ public class  FlowableController extends BaseController
 
             } else if ("1".equals(inf.getZfiCreateType())) {//核心开立
                 financeLog.addFinanceLog(zfiId, "平台资料审核退回，请重新核对资料再次提交", null, FinanceLog.STATUS_ONE);
-                //查询核心企业下的所有用户
+                //查询供应商企业下的所有用户
                 LambdaQueryWrapper<SysUserCompanyRel>  userCompanyRelWrapper  = new LambdaQueryWrapper<>();
-                userCompanyRelWrapper.eq(SysUserCompanyRel::getSucrCompanyId,zfiCoreId);
+                userCompanyRelWrapper.eq(SysUserCompanyRel::getSucrCompanyId,zfiSupplierId);
                 List<SysUserCompanyRel>  sysUserCompanyRelList = sysUserCompanyRelService.findSysUserCompanyRels(userCompanyRelWrapper);
                 if(sysUserCompanyRelList.size() < 1){
-                    throw new Exception("获取核心企业下的用户信息失败");
+                    throw new Exception("获取供应商企业下的用户信息失败");
                 }
                 String titleName = "【平台审核退回】融信【"+zfiNumber+"】平台审批退回，请维护资料后，再次提交";
                 //组装用户
@@ -1064,8 +1076,8 @@ public class  FlowableController extends BaseController
                     }
 
                 }
-                //给核心企业下的所有的用户生成待办
-                remoteSystemService.sendNotice(zfiCoreId,zfiId,titleName,"00","","01","0",userIds,"", "01", "/credit/creditUpdate/"+zfiId);
+                //给供应商下的所有的用户生成待办
+                remoteSystemService.sendNotice(zfiSupplierId,zfiId,titleName,"00","","04","0",userIds,"", "01", "/credit/addInformation/"+zfiId);
             } else if ("2".equals(inf.getZfiCreateType())) {//供应商开立
                 financeLog.addFinanceLog(zfiId, "平台审核融信资料【退回】，请编辑后，再次提交", null, FinanceLog.STATUS_ZERO);
                 //查询供应商下的所有用户