优化

platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActAuditRequest.java

@@ -12,6 +12,7 @@ import java.io.Serializable;
  */
 @Data
 public class ActAuditRequest implements Serializable {
+    private Boolean outStoreFlag;
     private String projectName;//项目名称
 
     private static final long serialVersionUID = 1L;

platform-common/src/main/java/com/platform/common/util/BeanUtils.java

@@ -73,7 +73,7 @@ public class BeanUtils implements ApplicationContextAware {
     }
 
     public static boolean isDev() {
-        return profile == 1;
+        return profile == 11;
     }
 
     public static boolean isTest() {
@@ -83,4 +83,4 @@ public class BeanUtils implements ApplicationContextAware {
     public static boolean isProd() {
         return profile == 2 || profile == 3;
     }
-}
+}

platform-rest/src/main/java/com/platform/rest/controller/activiti/OutStoreFormActivitiController.java

@@ -47,6 +47,7 @@ public class OutStoreFormActivitiController {
     @SysLog("审批单审核")
     @PutMapping("/audit")
     public R audit(@RequestBody ActAuditRequest actAuditRequest) {
+        actAuditRequest.setOutStoreFlag(true);
         outStoreFormActivitiServiceImpl.audit(actAuditRequest);
         return new R<>();
     }

platform-service/src/main/java/com/platform/service/customize/BaseFormCheckServiceAbstract.java

@@ -172,7 +172,7 @@ public abstract class BaseFormCheckServiceAbstract implements BaseFormCheckServi
         if (doAudit(actAuditRequest)) {
             if (!doCheckLast(actAuditRequest)) {
                 //若ProjectName含有包含‘龚文林’或者projectName==null,才分配下一个节点,否则结束审批
-                if (actAuditRequest.getProjectName()==null||actAuditRequest.getProjectName().contains("龚文林")) {
+                if (actAuditRequest.getOutStoreFlag()==null||(actAuditRequest.getProjectName()!=null&&actAuditRequest.getProjectName().contains("龚文林"))) {
                     // 分配下一个节点的审批人信息
                     Model model = repositoryService.createModelQuery().modelKey(actAuditRequest.getAuditModelKey()).singleResult();
                     List<ActivitiUserModel> list = activitiUserModelService.getModelByModelId(model.getId());