审批流调整

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -417,9 +417,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 //                taskDetailVO.setComment(comments.get(0).getFullMessage());
                 if (historicActivityInstance.getAssignee()!=null)
                 {
-                    List<UserListDTO> userList= orgUserMapper.QueryUserWithParentOrg(historicActivityInstance.getAssignee());
-                    taskDetailVO.setUserId(userList.get(0).getUserID());
-                    taskDetailVO.setUserName(userList.get(0).getRealName());
+                    SysUser user=   sysUserService.getById(historicActivityInstance.getAssignee());
+                    taskDetailVO.setUserId(user.getUserId().toString());
+                    taskDetailVO.setUserName(user.getRealName());
+
                 }
 
                 taskDetailVOS.add(taskDetailVO);
@@ -451,9 +452,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                             if (historicActivityInstance.getAssignee()!=null)
                             {
                                 SysUser user=   sysUserService.getById(historicActivityInstance.getAssignee());
-                                List<UserListDTO> userList= orgUserMapper.QueryUserWithParentOrg(historicActivityInstance.getAssignee());
-                                taskDetailVO.setUserId(userList.get(0).getUserID());
-                                taskDetailVO.setUserName(userList.get(0).getRealName());}
+                                taskDetailVO.setUserId(user.getUserId().toString());
+                                taskDetailVO.setUserName(user.getRealName());}
                             taskDetailVO.setActivityId(historicActivityInstance.getActivityId());
                             taskDetailVO.setName(historicActivityInstance.getActivityName());
                             taskDetailVO.setCreateTime(historicActivityInstance.getStartTime());