From 6dc824f3528ad2f1ac1b14cb55093d7574321386 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Wed, 24 Jan 2024 14:45:00 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86-=E5=B7=A5=E5=8D=95=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=BA=BA=E6=98=AF=E5=88=86=E7=BB=84=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=BB=84=E5=90=8E=EF=BC=8C=E5=BA=94=E8=AF=A5=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E7=BB=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=B7=B2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1070994834292736]工单处理-工单处理人是分组，删除组后，应该保留组数据，提示已删除 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1070994834292736
---
 .../process/service/ProcessTaskServiceImpl.java      | 12 ++++++++----
 .../process/thread/ProcessTaskNotifyThread.java      |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
index 8affc8b96..e4176fa6f 100644
--- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
+++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java
@@ -485,13 +485,15 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC
                     workerVo.setName(userVo.getUserName());
                 }
             } else if (workerVo.getType().equals(GroupSearch.TEAM.getValue())) {
-                TeamVo teamVo = teamMapper.getTeamByUuid(workerVo.getUuid());
+                TeamVo search = new TeamVo();
+                search.setUuid(workerVo.getUuid());
+                TeamVo teamVo = teamMapper.getTeamSimpleInfoByUuid(search);
                 if (teamVo != null) {
                     workerVo.setWorker(new WorkAssignmentUnitVo(teamVo));
                     workerVo.setName(teamVo.getName());
                 }
             } else if (workerVo.getType().equals(GroupSearch.ROLE.getValue())) {
-                RoleVo roleVo = roleMapper.getRoleByUuid(workerVo.getUuid());
+                RoleVo roleVo = roleMapper.getRoleSimpleInfoByUuid(workerVo.getUuid());
                 if (roleVo != null) {
                     workerVo.setWorker(new WorkAssignmentUnitVo(roleVo));
                     workerVo.setName(roleVo.getName());
@@ -828,13 +830,15 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC
                         workerVo.setName(userVo.getUserName());
                     }
                 } else if (workerVo.getType().equals(GroupSearch.TEAM.getValue())) {
-                    TeamVo teamVo = teamMapper.getTeamByUuid(workerVo.getUuid());
+                    TeamVo search = new TeamVo();
+                    search.setUuid(workerVo.getUuid());
+                    TeamVo teamVo = teamMapper.getTeamSimpleInfoByUuid(search);
                     if (teamVo != null) {
                         workerVo.setWorker(new WorkAssignmentUnitVo(teamVo));
                         workerVo.setName(teamVo.getName());
                     }
                 } else if (workerVo.getType().equals(GroupSearch.ROLE.getValue())) {
-                    RoleVo roleVo = roleMapper.getRoleByUuid(workerVo.getUuid());
+                    RoleVo roleVo = roleMapper.getRoleSimpleInfoByUuid(workerVo.getUuid());
                     if (roleVo != null) {
                         workerVo.setWorker(new WorkAssignmentUnitVo(roleVo));
                         workerVo.setName(roleVo.getName());
diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskNotifyThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskNotifyThread.java
index 817143313..11a9f9db6 100644
--- a/src/main/java/neatlogic/module/process/thread/ProcessTaskNotifyThread.java
+++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskNotifyThread.java
@@ -83,7 +83,7 @@ public class ProcessTaskNotifyThread extends NeatLogicThread {
     }
 
     public ProcessTaskNotifyThread(ProcessTaskStepVo _currentProcessTaskStepVo, INotifyTriggerType _trigger) {
-        super("PROCESSTASK-NOTIFY" + (_currentProcessTaskStepVo != null ? "-" + _currentProcessTaskStepVo.getId() : ""));
+        super("PROCESSTASK-NOTIFY" + (_trigger != null ? "-" + _trigger.getTrigger() : "") + (_currentProcessTaskStepVo != null ? "-" + _currentProcessTaskStepVo.getId() : ""));
         currentProcessTaskStepVo = _currentProcessTaskStepVo;
         notifyTriggerType = _trigger;
     }
-- 
Gitee