东北港口流程图按部门调整成两个

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -382,7 +382,7 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         String workTypeValue = sysDictData.getDictKey();
 
         String processDefinitionKey = "";
-        if (orgTypeByOrgId == 0) {
+        /*if (orgTypeByOrgId == 0) {
             if (WorkTypeEnum.CONFINED_SPACE_WORK.getValue().equals(workTypeValue)) {
                 processDefinitionKey = "hazardousTaskConfinedSpace";
             } else if (WorkTypeEnum.CIRCULATING_FUMIGATION.getValue().equals(workTypeValue)) {
@@ -404,6 +404,20 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
             } else {
                 processDefinitionKey = "hazardousTaskBLOrg";
             }
+        }*/
+
+        if (orgTypeByOrgId == 0) {
+            if (WorkTypeEnum.CONFINED_SPACE_WORK.getValue().equals(workTypeValue)) {
+                processDefinitionKey = "hazardousTaskConfinedSpace";
+            } else if (WorkTypeEnum.CIRCULATING_FUMIGATION.getValue().equals(workTypeValue)) {
+                processDefinitionKey = "hazardousTaskStifling";
+            }else {
+                processDefinitionKey = "hazardousTaskCommon";
+            }
+        } else if (orgTypeByOrgId == 1) {
+            processDefinitionKey = "BL1";
+        } else if (orgTypeByOrgId == 2) {
+            processDefinitionKey = "BL2";
         }
         processInsStartParams.setProcessDefinitionKey(processDefinitionKey);
         processInsStartParams.setOrgId(tHazardWorkPlan.getOrgId());

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/service/impl/NewSysOrgServiceImpl.java

@@ -261,7 +261,7 @@ public class NewSysOrgServiceImpl extends SuperServiceImpl<NewSysOrgDao, NewSysO
 
     @Override
     public Integer getOrgTypeByOrgId(String orgId) {
-        TSysConfig tSysConfig = tSysConfigService.getOne(new QueryWrapper<TSysConfig>().like("config_value", orgId));
+        TSysConfig tSysConfig = tSysConfigService.getOne(new QueryWrapper<TSysConfig>().like("config_value", orgId).eq("status",0));
         if (ObjectHelper.isNotEmpty(tSysConfig)) {
             String configKey = tSysConfig.getConfigKey();
             if (configKey.equals("sys.beiliang.depts")) {