Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev

pmapi/src/main/java/com/ningdatech/pmapi/sys/contants/UserGuidanceContant.java

@@ -15,6 +15,8 @@ public interface UserGuidanceContant {
         public static final String GUIDANCE_REMARK = "用户项目审核,请先配置单位默认流程";
         public static final String GUIDANCE_PATH1 = "unitSet/flowPathConfiguration";
         public static final String GUIDANCE_PATH2 = "unitSet/unitConfigEdit?processDefId=";
+
+        public static final String EMPTY_PROCESS = "{}";
     }
 
     class FiscalCode {
@@ -24,8 +26,8 @@ public interface UserGuidanceContant {
     }
 
     class Signature {
-        public static final String GUIDANCE_NAME = "配置财政编码";
-        public static final String GUIDANCE_REMARK = "用于生成项目唯一编码";
+        public static final String GUIDANCE_NAME = "配置印章编码";
+        public static final String GUIDANCE_REMARK = "用于电子签章";
         public static final String GUIDANCE_PATH = "unitSet/fiscalCodeSet";
     }
 }

pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/UserGuidanceManage.java

@@ -74,7 +74,8 @@ public class UserGuidanceManage {
         }else{
             orgModelGuidance.setPath(UserGuidanceContant.OrgModel.GUIDANCE_PATH2 + orgModel.getProcessDefId());
             //判断process是否为空
-            if(StringUtils.isNotBlank(orgModel.getProcess())){
+            if(StringUtils.isNotBlank(orgModel.getProcess()) &&
+                !UserGuidanceContant.OrgModel.EMPTY_PROCESS.equals(orgModel.getProcess())){
                 orgModelGuidance.setIsFinish(Boolean.TRUE);
                 finishedNum ++;
             }else{