外贸加签人判定

ServiceSite/src/main/java/com/seasky/flowportal/service/impl/WaiMao_VerifyReimbursementServiceImpl.java

@@ -122,21 +122,24 @@ public class WaiMao_VerifyReimbursementServiceImpl extends VerifyReimbursementSe
     }
 
     private boolean needAddSigner(ExpenseReimbursementCmd cmd) {
-        boolean addSigner = cmd.getFundsProjectCodeList().stream().noneMatch(code ->
+        boolean notAddSigner = cmd.getFundsProjectCodeList().stream().anyMatch(code ->
                 ObjectUtils.isNotEmpty(code) && code.length() >= 3 && 'C' == Character.toUpperCase(code.charAt(2))
-        );;
-        if (!addSigner)
-            addSigner = checkApplyUserEqualsProjectCharge(cmd);
-        if (!addSigner) {
-            if (OrderTypesEnum.isSalary(cmd.getOrderType())) {
-                ExtendFieldCmd extendFieldCmd = cmd.getExtendFieldCmd();
-                Map<String, Boolean> payeeContainingMap = ObjectUtils.isEmpty(extendFieldCmd) ? null : extendFieldCmd.getPayeeContainingMap();
-                addSigner = ObjectUtils.isNotEmpty(payeeContainingMap) && payeeContainingMap.get("0");
+        );
+        boolean addSigner = false;
+        if (!notAddSigner) {
+            if (!addSigner)
+                addSigner = checkApplyUserEqualsProjectCharge(cmd);
+            if (!addSigner) {
+                if (OrderTypesEnum.isSalary(cmd.getOrderType())) {
+                    ExtendFieldCmd extendFieldCmd = cmd.getExtendFieldCmd();
+                    Map<String, Boolean> payeeContainingMap = ObjectUtils.isEmpty(extendFieldCmd) ? null : extendFieldCmd.getPayeeContainingMap();
+                    addSigner = ObjectUtils.isNotEmpty(payeeContainingMap) && payeeContainingMap.get("0");
+                }
+                else
+                    addSigner = super.checkPayeeEqualsProjectCharge(cmd);
             }
-            else
-                addSigner = super.checkPayeeEqualsProjectCharge(cmd);
         }
-        if (!addSigner) {
+        if (notAddSigner || !addSigner) {
             List<String> claimsEndorserNoList = cmd.getClaimsEndorserNoList();
             if (ObjectUtils.isEmpty(claimsEndorserNoList)) {
                 String processInstanceId = cmd.getProcessInstanceId();