diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index c988c160..2bf0524c 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -123,10 +123,14 @@ public class TaskController { historicTaskInstance.put("assignee", str); } }else{ - ResponseMessage assignee = lawsUserInfoService.getById(historicTaskInstance.get("assignee").toString()); + ResponseMessage 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")); @@ -134,7 +138,7 @@ public class TaskController { List list1 = iBusProcessEntrustService.list(queryWrapper2); String str = ""; if(list1.size()>0){ - ResponseMessage assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId()); + ResponseMessage assignee1 = lawsUserInfoService.getByIdFeignClientWithDisabled(list1.get(0).getUserId()); historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)"); } } @@ -263,10 +267,14 @@ public class TaskController { historicTaskInstance.put("assignee", str); } }else{ - ResponseMessage assignee = lawsUserInfoService.getById(historicTaskInstance.get("assignee").toString()); + ResponseMessage 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")); @@ -274,7 +282,7 @@ public class TaskController { List list1 = iBusProcessEntrustService.list(queryWrapper2); String str = ""; if(list1.size()>0){ - ResponseMessage assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId()); + ResponseMessage assignee1 = lawsUserInfoService.getByIdFeignClientWithDisabled(list1.get(0).getUserId()); historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)"); } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 144924eb..7b7c7914 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -63,6 +63,9 @@ public interface LawsUserInfoService { @GetMapping("sys/user/getById") public ResponseMessage getById(@RequestParam("id") String id); + @GetMapping("sys/user/getByIdWithDisabled") + public ResponseMessage getByIdFeignClientWithDisabled(@RequestParam("id") String id); + @GetMapping("lawss/sarProductInfo/queryMap") public ResponseMessage>> queryMap();