diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index 8affc8b969b0a7758b3cc56576bdd937dc8580cf..e4176fa6f00cfb1cff648823900eb1073c6fae12 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 81714331348534323cc816d2d10352e8539bbd42..11a9f9db6ac8d17bc237f8c85ea116b4aeace74c 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; }