考勤配置审核角色修改

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysUserRoleServiceImpl.java

@@ -162,11 +162,19 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
         List<String> userIdList = null;
         for (SysDingGroup sysDingGroup : sysDingGroupList) {
             //首选找考勤对象
-            List<SysDingObj> sysDingObjList = sysDingObjService.list(new QueryWrapper<SysDingObj>().lambda().eq(SysDingObj::getDingGroupId, sysDingGroup.getId()).eq(SysDingObj::getType, DingObjTypeEnum.DING));
+            List<SysDingObj> sysDingObjList = sysDingObjService.list(new QueryWrapper<SysDingObj>().lambda().eq(SysDingObj::getDingGroupId, sysDingGroup.getId()));
             if (CollectionUtils.isEmpty(sysDingObjList)) {
                 throw ExceptionResultEnum.SERVICE_DING_NO_DATA.exception();
             }
+            List<SysDingObj> sysDingApproveList = new ArrayList<>(), sysDingList = new ArrayList<>();
             for (SysDingObj s : sysDingObjList) {
+                if (s.getType() == DingObjTypeEnum.DING) {
+                    sysDingList.add(s);
+                } else if (s.getType() == DingObjTypeEnum.APPROVE) {
+                    sysDingApproveList.add(s);
+                }
+            }
+            for (SysDingObj s : sysDingList) {
                 if (userArchivesRoleMap.containsKey(s.getRoleId())) {
                     userIdList = new ArrayList<>();
                     break;
@@ -175,13 +183,10 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
             if (Objects.isNull(userIdList)) {
                 continue;
             }
-
-            //再找审核对象
-            List<SysDingObj> sysDingApproveObjList = sysDingObjService.list(new QueryWrapper<SysDingObj>().lambda().eq(SysDingObj::getDingGroupId, sysDingGroup.getId()).eq(SysDingObj::getType, DingObjTypeEnum.APPROVE));
-            if (CollectionUtils.isEmpty(sysDingApproveObjList)) {
+            if (CollectionUtils.isEmpty(sysDingApproveList)) {
                 throw ExceptionResultEnum.SERVICE_DING_APPROVE_NO_DATA.exception();
             }
-            List<Long> roleIsList = sysDingApproveObjList.stream().map(s -> s.getRoleId()).collect(Collectors.toList());
+            List<Long> roleIsList = sysDingApproveList.stream().map(s -> s.getRoleId()).collect(Collectors.toList());
             //首选查角色类型
             List<SysRole> sysRoleList = sysRoleService.listByIds(roleIsList);
             List<Long> sysRoleOtherList = new ArrayList<>();