From 789852e52390729cb8f2cf957a49249f08c7efb0 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 14 Nov 2023 10:46:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add:=20=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8B=A5=E7=94=A8=E6=88=B7=E5=B7=B2=E7=A6=81=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 26 +++++++++++-------- .../business_auth/LawsUserInfoService.java | 3 +++ 2 files changed, 18 insertions(+), 11 deletions(-) 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 602178f3..3f47742d 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 @@ -241,19 +241,23 @@ 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()); - historicTaskInstance.put("assigneeId", assignee.getData().getUsid()); - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); - queryWrapper2.orderByDesc("CREATE_TIME"); - List list1 = iBusProcessEntrustService.list(queryWrapper2); - String str = ""; - if(list1.size()>0){ - ResponseMessage assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId()); - historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.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")); + queryWrapper2.orderByDesc("CREATE_TIME"); + List list1 = iBusProcessEntrustService.list(queryWrapper2); + String str = ""; + if(list1.size()>0){ + ResponseMessage assignee1 = lawsUserInfoService.getById(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(); From 8354de9af5d9c1d76c2eae99cda086073022da3b Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 14 Nov 2023 15:39:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add:=20=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8B=A5=E7=94=A8=E6=88=B7=E5=B7=B2=E7=A6=81=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) 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 3f47742d..ad84bf60 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 @@ -122,10 +122,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")); @@ -133,7 +137,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()+" 转办)"); } } @@ -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 list1 = iBusProcessEntrustService.list(queryWrapper2); - String str = ""; - if(list1.size()>0){ - ResponseMessage 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 list1 = iBusProcessEntrustService.list(queryWrapper2); + String str = ""; + if(list1.size()>0){ + ResponseMessage assignee1 = lawsUserInfoService.getByIdFeignClientWithDisabled(list1.get(0).getUserId()); + historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)"); } } }