add: 监控流程若用户已禁用,修改显示方式
This commit is contained in:
@@ -122,10 +122,14 @@ public class TaskController {
|
||||
historicTaskInstance.put("assignee", str);
|
||||
}
|
||||
}else{
|
||||
ResponseMessage<UserVO> assignee = lawsUserInfoService.getById(historicTaskInstance.get("assignee").toString());
|
||||
ResponseMessage<UserVO> assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(historicTaskInstance.get("assignee").toString());
|
||||
|
||||
if(assignee.getData()!=null){
|
||||
historicTaskInstance.put("assignee", assignee.getData().getUname());
|
||||
if (assignee.getData().getDisableFlag() == 1) {
|
||||
historicTaskInstance.put("assignee", assignee.getData().getUname() + "(已禁用)");
|
||||
} else{
|
||||
historicTaskInstance.put("assignee", assignee.getData().getUname());
|
||||
}
|
||||
historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
|
||||
@@ -133,7 +137,7 @@ public class TaskController {
|
||||
List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
|
||||
String str = "";
|
||||
if(list1.size()>0){
|
||||
ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId());
|
||||
ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getByIdFeignClientWithDisabled(list1.get(0).getUserId());
|
||||
historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
|
||||
}
|
||||
}
|
||||
@@ -248,16 +252,16 @@ public class TaskController {
|
||||
historicTaskInstance.put("assignee", assignee.getData().getUname() + "(已禁用)");
|
||||
} else {
|
||||
historicTaskInstance.put("assignee", assignee.getData().getUname());
|
||||
historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
|
||||
queryWrapper2.orderByDesc("CREATE_TIME");
|
||||
List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
|
||||
String str = "";
|
||||
if(list1.size()>0){
|
||||
ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId());
|
||||
historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
|
||||
}
|
||||
}
|
||||
historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
|
||||
queryWrapper2.orderByDesc("CREATE_TIME");
|
||||
List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
|
||||
String str = "";
|
||||
if(list1.size()>0){
|
||||
ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getByIdFeignClientWithDisabled(list1.get(0).getUserId());
|
||||
historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user