审批条件增加

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -404,18 +404,28 @@ public class ActBusinessController {
                 int isConfirm =  busiData.get("is_confirm") == null ? 0 : (Integer) busiData.get("is_confirm");
                 String ticketId =  busiData.get("id").toString();
 
+                int countNum = sysBaseAPI.getIncidentTicket(ticketId);
+                List<Map<String,String>> countSupplier = new ArrayList<>();
+
+                if(StringUtils.isNotBlank(responsibility_company)){
+                    countSupplier = getSupplierSrm(responsibility_company);
+                }
                 if(isConfirm != 1 && StringUtils.isNotBlank(responsibility_company)){
 
-                    int countNum = sysBaseAPI.getIncidentTicket(ticketId);
                     if(countNum > 0){
-                        List<Map<String,String>> countSupplier = getSupplierSrm(responsibility_company);
+
                         if(countSupplier.size() > 0 ){
                             return Result.error("该事故单供应商还未确认，请确认后再次提交");
                         }
-
                     }
 
                 }
+                if(StringUtils.isBlank(responsibility_company) || countNum == 0 || countSupplier.size() == 0){
+                    String factorySignature = busiData.get("factory_signature") == null || busiData.get("factory_signature") == "" ? "" : busiData.get("factory_signature").toString();
+                    if(StringUtils.isBlank(factorySignature)){
+                        return Result.error("该事故单工厂签章必填，请上传后提交");
+                    }
+                }
             }catch (Exception e){
                 return Result.error("该事故单供应商还未确认，请刷新后重试");
             }