Merge remote-tracking branch 'origin/master'

sc-service/src/main/java/com/huyi/service/conmany/controller/OwnCompanyManageController.java

@@ -210,7 +210,7 @@ public class OwnCompanyManageController extends BaseController
             throw new Exception("企业名称不能为空");
         }
         //企业名称正则校验
-        String checkScyName = "^([\\u4e00-\\u9fa5]+|[a-zA-Z0-9]+)$";
+        String checkScyName = "^[\\u4E00-\\u9FFF0-9A-Z《》()（）]+$";
         Pattern regeScyName = Pattern.compile(checkScyName);
         Matcher matcherScyName = regeScyName.matcher(scyName);
         boolean isMatScyName = matcherScyName.matches();
@@ -239,7 +239,7 @@ public class OwnCompanyManageController extends BaseController
             throw new Exception("联系人长度不能超过30字；请检查是否正确");
         }
         //联系人正则校验
-        String checkNickName = "^([\\u4e00-\\u9fa5]+|[a-zA-Z0-9]+)$";
+        String checkNickName = "^[A-Za-z\\u4e00-\\u9fa5]+$";
         Pattern regeNickName = Pattern.compile(checkNickName);
         Matcher matcherNickName = regeNickName.matcher(nickName);
         boolean isMatNickName = matcherNickName.matches();

sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.java

@@ -407,26 +407,29 @@ public class OwnMessageController extends BaseController {
                 contractIdList = CommonUtil.getIdFromList(proConRelsList,"zfpcrContractId");
             }
         }
-
         List<PubFileInf>  fileInfList  = new ArrayList<>();
         List<ZcFinanceContract>  contractList = new ArrayList<>();
-        //查询合同
-        LambdaQueryWrapper<ZcFinanceContract> contractLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        contractLambdaQueryWrapper.in(ZcFinanceContract::getZfcId,contractIdList);
-        contractLambdaQueryWrapper.like(ZcFinanceContract::getZfcNode,code);
-        contractLambdaQueryWrapper.orderByAsc(ZcFinanceContract::getZfcFile);
-        contractList =   contractService.findZcFinanceContracts(contractLambdaQueryWrapper);
-        if(contractList.size() > 0 ){
-            //提取文件编号
-            List<String> fileIdList = CommonUtil.getIdFromList(contractList,"zfcFile");
-            LambdaQueryWrapper<PubFileInf> fileInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            fileInfLambdaQueryWrapper.in(PubFileInf::getPfiFileId,fileIdList);
-            fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
-            fileInfLambdaQueryWrapper.orderByAsc(PubFileInf::getPfiFileId);
-            fileInfList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
+        //该节点存在合同
+        if(contractIdList.size() > 0){
+            //查询合同
+            LambdaQueryWrapper<ZcFinanceContract> contractLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            contractLambdaQueryWrapper.in(ZcFinanceContract::getZfcId,contractIdList);
+            contractLambdaQueryWrapper.like(ZcFinanceContract::getZfcNode,code);
+            contractLambdaQueryWrapper.orderByAsc(ZcFinanceContract::getZfcFile);
+            contractList =   contractService.findZcFinanceContracts(contractLambdaQueryWrapper);
+            if(contractList.size() > 0 ){
+                //提取文件编号
+                List<String> fileIdList = CommonUtil.getIdFromList(contractList,"zfcFile");
+                LambdaQueryWrapper<PubFileInf> fileInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                fileInfLambdaQueryWrapper.in(PubFileInf::getPfiFileId,fileIdList);
+                fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
+                fileInfLambdaQueryWrapper.orderByAsc(PubFileInf::getPfiFileId);
+                fileInfList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
+            }
         }
 
 
+        //循环文件盖章
         for(int i = 0 ; i < fileInfList.size(); i++){
             //判断是否为已盖章文件
             LambdaQueryWrapper<ZcFinanceFileRel> fileRelLambdaQueryWrapper = new LambdaQueryWrapper<>();