|
|
|
|
@ -653,7 +653,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
varMap.put("startTime", historicProcessInstance.getStartTime()); |
|
|
|
|
varMap.put("endTime", historicProcessInstance.getEndTime()); |
|
|
|
|
varMap.put("startUserId", userClient.userInfoById(Long.parseLong(historicProcessInstance.getStartUserId())).getData().getRealName()); |
|
|
|
|
varMap.put("startDeptId", userClient.userInfoById(Long.parseLong(historicProcessInstance.getStartUserId())).getData().getDeptId()); |
|
|
|
|
varMap.put("startDeptId", varMap.get("guanlibumen")); |
|
|
|
|
varMap.put("processInstanceId", historicProcessInstance.getId()); |
|
|
|
|
|
|
|
|
|
List<HistoricTaskInstance> taskInstanceList = historyService.createHistoricTaskInstanceQuery().processInstanceId(historicProcessInstance.getId()).orderByTaskCreateTime().desc().list(); |
|
|
|
|
@ -668,12 +668,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
List<Map<String, Object>> workOrderList = new ArrayList<>(); |
|
|
|
|
List<String> deptIds = Func.toStrList(AuthUtil.getDeptId()); |
|
|
|
|
workOrders.forEach(order -> { |
|
|
|
|
List<String> deptId = Func.toStrList(order.get("startDeptId").toString()); |
|
|
|
|
for (String s : deptId) { |
|
|
|
|
if (deptIds.contains(s)) { |
|
|
|
|
String deptId = order.get("startDeptId").toString(); |
|
|
|
|
if (deptIds.contains(deptId)) { |
|
|
|
|
workOrderList.add(order); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
workOrders = workOrderList; |
|
|
|
|
|
|
|
|
|
|