From 9366853f0c1392bc837dee4c361c8830968b61d6 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 2 Sep 2021 15:20:57 +0800 Subject: [PATCH] feat: There is no way the Transfer and withdrawal --- .../ydw/bat/wkflow/business_activiti/task/TaskController.java | 2 +- .../bat/wkflow/business_activiti/task/TodoTaskController.java | 3 ++- 2 files changed, 3 insertions(+), 2 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 c6559d31..6a0bae20 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 @@ -84,7 +84,7 @@ public class TaskController { historicTaskInstance.put("assigneeId", assignee.getData().getUsid()); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); - queryWrapper2.orderByAsc("CREATE_TIME"); + queryWrapper2.orderByDesc("CREATE_TIME"); List list1 = iBusProcessEntrustService.list(queryWrapper2); String str = ""; if(list1.size()>0){ diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 67f28124..c62da5c8 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -149,6 +149,7 @@ public class TodoTaskController extends BaseAction { BeanUtils.copyProperties(busProcessName,res); res.setTaskIds(map.get("id").toString()); res.setTaskInfo(entry.getValue().get(0).get("name").toString()); + res.setTaskAssignee(entry.getValue().get(0).get("assignee").toString()); res.setMes(null); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String data = sdf.format(entry.getValue().get(0).get("createTime")); @@ -2084,7 +2085,7 @@ public class TodoTaskController extends BaseAction { for (Task task : list2) { if (task.getAssignee() != null && !task.getAssignee().equals("")) { ResponseMessage byId = lawsUserInfoService.getById(task.getAssignee()); - if (byId.getData() != null) { + if (byId.getData() != null && byId.getData().getUname() != null) { if (assignee.indexOf(byId.getData().getUname()) == -1) { assignee += ((byId.getData().getOrgName() != null && !byId.getData().getOrgName().equals("")) ? byId.getData().getOrgName() + "-" + byId.getData().getUname() : byId.getData().getUname()) + ","; }