修改

jinlin

2024-01-10 cdf29a8f6fb9990f82ccc1d3f47bfba48cfaf4fc

 zt/core/src/main/java/com/zt/modules/workflow/service/WorkflowService.java

@@ -294,36 +294,15 @@
        taskParamDto.setBizInfoDto(bizInfoDto);

        if (finallyStep.getStepNo() > currentStep.getStepNo()) {
            String roleIds = currentStep.getApproverRoleIds();
            if (!StringUtils.isBlank(roleIds)) {
                roleIds = roleIds.replace(",,", ",");
                roleIds = roleIds.replace(",,", ",");
            }
            if (StringUtils.isBlank(roleIds)) {
                throw new RuntimeException("没有设置下一步流程角色！");
            }

            Integer isSelfDept = currentStep.getIsSelfDept();
            String[] roleIdArr = roleIds.split(",");
            if (isSelfDept > 0 && bizInfoList.size() > 0) {
                deptIds = bizInfoList.get(0).getDeptIds();
            if (isSelfDept > 0 && bizInfoDto!=null) {
                deptIds = bizInfoDto.getDeptIds();
            }
            if (isSelfDept == 0)
                deptIds = null;

            String zyIds = null;
            String bizGroupId = bizInfoList.get(0).getBizId();
            if (!StringUtils.isBlank(currentStep.getTaskGroup())
                    && !StringUtils.isBlank(currentStep.getTaskGroupSql())) {
                sqlStr = currentStep.getTaskGroupSql();
                sqlStr = sqlStr.replace("${bizId}", bizId.toString());
                sqlStr = sqlStr.replace("${bizGroupId}", bizGroupId);
                List<BizInfoDto> bizInfoList2 = baseDao.getSqlResult(sqlStr);
                if ("cj".equals(currentStep.getTaskGroup()))
                    deptIds = bizInfoList2.get(0).getId();
                if ("zy".equals(currentStep.getTaskGroup()))
                    zyIds = bizInfoList2.get(0).getId();
            }
            if ("br".equals(currentStep.getTaskGroup())) {
                List<SysUser> listUser = baseDao.getAssignUser(wfDef.getCode(), currentStep.getStepMarker(), bizId);
                for (SysUser user : listUser) {
@@ -335,6 +314,36 @@
                    taskParamDto.setGroupId2(user.getId());
                    insertFlowTaskData(taskParamDto);
                }
            }
            else if (currentStep.getTaskGroup() !=null && "pall,zrr,csr,shr,pzr".contains(currentStep.getTaskGroup())) {
                String userList = null;
                if ("zrr".equals(currentStep.getTaskGroup())){
                    userList = bizInfoDto.getZrr();
                }
                if ("csr".equals(currentStep.getTaskGroup())){
                    userList = bizInfoDto.getCsr();
                }
                if ("shr".equals(currentStep.getTaskGroup())){
                    userList = bizInfoDto.getShr();
                }
                if ("pzr".equals(currentStep.getTaskGroup())){
                    userList = bizInfoDto.getPzr();
                }
                if ("pall".equals(currentStep.getTaskGroup())){
                    userList = bizInfoDto.getPall();
                }
                if (userList != null) {
                    String[] userArr = userList.split(",");
                    Long groupId2 = UUIDUtil.generateId();
                    for (String userStr : userArr) {
                        Long userId = Convert.toLong(userStr);
                        SysUser user = baseDao.getUserById(userId);
                        existsUsers.put(userId, "");
                        taskParamDto.setUser(user);
                        taskParamDto.setGroupId2(groupId2);
                        insertFlowTaskData(taskParamDto);
                    }
                }
            } else if ("sqr".equals(currentStep.getTaskGroup())) {
                SysUser user = baseDao.getUserById(bizInfoList.get(0).getApplyUserId());
                existsUsers.put(user.getId(), "");
@@ -342,8 +351,15 @@
                taskParamDto.setGroupId2(user.getId());
                insertFlowTaskData(taskParamDto);
            } else {
                String roleIds = currentStep.getApproverRoleIds();
                if (StringUtils.isBlank(roleIds)) {
                    throw new RuntimeException("没有设置下一步流程角色！");
                }
                String[] roleIdArr = roleIds.split(",");
                for (String roleId : roleIdArr) {
                    List<SysUser> listUser = baseDao.getTaskUser(roleId, deptIds, zyIds);
                    if (StringUtils.isBlank(roleId))
                        continue;
                    List<SysUser> listUser = baseDao.getTaskUser(roleId, deptIds);
                    for (SysUser user : listUser) {
                        if (existsUsers.containsKey(user.getId())) {
                            continue;