FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_foton_20231031' into 'dev_20230829_change'

Browse Source 
Fix foton 20231031

See merge request laws-foton-slrs/foton-wkflow-rest!67
This commit is contained in:
高嵩
2023-11-16 03:45:22 +00:00
parent 7e2a9df1d6 8354de9af5
commit a7eb631b0b
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java
+14 -6
View File
@@ -123,10 +123,14 @@ 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){
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()); historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
@@ -134,7 +138,7 @@ public class TaskController {
List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2); List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
String str = ""; String str = "";
if(list1.size()>0){ 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()+" 转办)"); historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
} }
} }
@@ -263,10 +267,14 @@ 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){
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()); historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
@@ -274,7 +282,7 @@ public class TaskController {
List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2); List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
String str = ""; String str = "";
if(list1.size()>0){ 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()+" 转办)"); historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
} }
} }
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+3
View File
@@ -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();