zhangherong
9 天以前 b463880866cb946b824e989667ff3f0c0faf22f6
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
@@ -1150,28 +1150,28 @@
        String username = iFlowThirdService.getLoginUser().getUsername();
        flowMyBusinessDto.setCurrentUser(username);
        List<FlowTaskDto> list = flowMyBusinessService.ListMyBusiness(flowMyBusinessDto);
        list.forEach(flowTaskDto -> {
            // 流程发起人信息
            HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
                    .processInstanceId(flowTaskDto.getProcInsId())
                    .singleResult();
            if (historicProcessInstance != null) {
                SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
                if (startUser != null) {
                    flowTaskDto.setStartUserId(startUser.getUsername());
                    flowTaskDto.setStartUserName(startUser.getRealname());
                }
                List<String> departNamesByUsername = iFlowThirdService.getDepartNamesByUsername(historicProcessInstance.getStartUserId());
                flowTaskDto.setStartDeptName(CollUtil.join(departNamesByUsername, ","));
                if (flowTaskDto.getTodoUsers() == null) {
                    flowTaskDto.setTodoUsers("");
                } else {
                    //去除[]
                    flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
                    flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\"", ""));
                }
            }
        });
//        list.forEach(flowTaskDto -> {
//            // 流程发起人信息
//            HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
//                    .processInstanceId(flowTaskDto.getProcInsId())
//                    .singleResult();
//            if (historicProcessInstance != null) {
//                SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
//                if (startUser != null) {
//                    flowTaskDto.setStartUserId(startUser.getUsername());
//                    flowTaskDto.setStartUserName(startUser.getRealname());
//                }
//                List<String> departNamesByUsername = iFlowThirdService.getDepartNamesByUsername(historicProcessInstance.getStartUserId());
//                flowTaskDto.setStartDeptName(CollUtil.join(departNamesByUsername, ","));
//                if (flowTaskDto.getTodoUsers() == null) {
//                    flowTaskDto.setTodoUsers("");
//                } else {
//                    //去除[]
//                    flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
//                    flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\"", ""));
//                }
//            }
//        });
        IPage<FlowTaskDto> flowTaskDtoIPage = new Page<>();
        flowTaskDtoIPage.setRecords(list);
        flowTaskDtoIPage.setTotal(page.getTotal());