add: 监控流程若用户已禁用,修改显示方式

This commit is contained in:
wxyclub
2023-11-14 10:46:43 +08:00
parent 1392c58727
commit 789852e523
2 changed files with 18 additions and 11 deletions
@@ -241,9 +241,12 @@ public class TaskController {
historicTaskInstance.put("assignee", str); historicTaskInstance.put("assignee", str);
} }
}else{ }else{
ResponseMessage<UserVO> assignee = lawsUserInfoService.getById(historicTaskInstance.get("assignee").toString()); ResponseMessage<UserVO> assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(historicTaskInstance.get("assignee").toString());
if(assignee.getData()!=null){ if(assignee.getData()!=null){
if (assignee.getData().getDisableFlag() == 1) {
historicTaskInstance.put("assignee", assignee.getData().getUname() + "(已禁用)");
} else {
historicTaskInstance.put("assignee", assignee.getData().getUname()); historicTaskInstance.put("assignee", assignee.getData().getUname());
historicTaskInstance.put("assigneeId", assignee.getData().getUsid()); historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
@@ -257,6 +260,7 @@ public class TaskController {
} }
} }
} }
}
historicTaskInstance.put("prcType",one.getPrcType()); historicTaskInstance.put("prcType",one.getPrcType());
historicTaskInstance.put("prcName",one.getPrcName()); historicTaskInstance.put("prcName",one.getPrcName());
historicTaskInstance.put("prcNum",one.getPrcNum()); historicTaskInstance.put("prcNum",one.getPrcNum());
@@ -63,6 +63,9 @@ public interface LawsUserInfoService {
@GetMapping("sys/user/getById") @GetMapping("sys/user/getById")
public ResponseMessage<UserVO> getById(@RequestParam("id") String id); public ResponseMessage<UserVO> getById(@RequestParam("id") String id);
@GetMapping("sys/user/getByIdWithDisabled")
public ResponseMessage<UserVO> getByIdFeignClientWithDisabled(@RequestParam("id") String id);
@GetMapping("lawss/sarProductInfo/queryMap") @GetMapping("lawss/sarProductInfo/queryMap")
public ResponseMessage<Map<String, List<String>>> queryMap(); public ResponseMessage<Map<String, List<String>>> queryMap();