From ddd2e548fac51675ec3f034c2b4576af1283306d Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 2 Jan 2025 15:52:26 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=85=A8=E5=B1=80=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?tab=E5=9B=BA=E5=AE=9A&=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1325213151625216]工单详情页全局默认tab固定&顺序 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1325213151625216
---
 .../api/processtask/ProcessTaskStepGetApi.java       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java
index 34a47ae84..96658929d 100644
--- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java
+++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java
@@ -1,5 +1,6 @@
 package neatlogic.module.process.api.processtask;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.asynchronization.thread.NeatLogicThread;
 import neatlogic.framework.asynchronization.threadpool.CachedThreadPool;
@@ -8,7 +9,6 @@ import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.config.ConfigManager;
 import neatlogic.framework.exception.type.PermissionDeniedException;
 import neatlogic.framework.process.auth.PROCESS_BASE;
-import neatlogic.framework.process.operationauth.core.IOperationType;
 import neatlogic.framework.process.constvalue.ItsmTenantConfig;
 import neatlogic.framework.process.constvalue.ProcessTaskOperationType;
 import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType;
@@ -16,6 +16,7 @@ import neatlogic.framework.process.dto.ProcessTaskScoreTemplateVo;
 import neatlogic.framework.process.dto.ProcessTaskStepVo;
 import neatlogic.framework.process.dto.ProcessTaskVo;
 import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException;
+import neatlogic.framework.process.operationauth.core.IOperationType;
 import neatlogic.framework.process.operationauth.core.ProcessAuthManager;
 import neatlogic.framework.restful.annotation.*;
 import neatlogic.framework.restful.constvalue.OperationTypeEnum;
@@ -24,6 +25,7 @@ import neatlogic.module.process.common.config.ProcessConfig;
 import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper;
 import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper;
 import neatlogic.module.process.service.ProcessTaskService;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -195,7 +197,7 @@ public class ProcessTaskStepGetApi extends PrivateApiComponentBase {
 
         // TODO 兼容老工单表单（判断是否存在旧表单）
         Map<String, String> oldFormPropMap = processTaskMapper.getProcessTaskOldFormAndPropByTaskId(processTaskId);
-        if (oldFormPropMap != null && oldFormPropMap.size() > 0) {
+        if (MapUtils.isNotEmpty(oldFormPropMap)) {
             processTaskVo.setIsHasOldFormProp(1);
         }
         // 移动端默认展开表单
@@ -219,6 +221,12 @@ public class ProcessTaskStepGetApi extends PrivateApiComponentBase {
         JSONObject resultObj = new JSONObject();
         resultObj.put("processTask", processTaskVo);
         resultObj.put("processTaskRelationCount", processTaskMapper.getProcessTaskRelationCountByProcessTaskId(processTaskVo.getId()));
+        JSONObject processTaskTabLayoutObj = new JSONObject();
+        String processTaskTabLayout = ConfigManager.getConfig(ItsmTenantConfig.PROCESSTASK_TAB_LAYOUT);
+        if (StringUtils.isNotBlank(processTaskTabLayout)) {
+            processTaskTabLayoutObj = JSON.parseObject(processTaskTabLayout);
+        }
+        resultObj.put("processTaskTabLayout", processTaskTabLayoutObj);
         return resultObj;
     }
 
-- 
Gitee