考勤配置审核角色修改

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

@@ -161,9 +161,10 @@ 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.APPROVE));
+            //首选找考勤对象
+            List<SysDingObj> sysDingObjList = sysDingObjService.list(new QueryWrapper<SysDingObj>().lambda().eq(SysDingObj::getDingGroupId, sysDingGroup.getId()).eq(SysDingObj::getType, DingObjTypeEnum.DING));
             if (CollectionUtils.isEmpty(sysDingObjList)) {
-                throw ExceptionResultEnum.SERVICE_DING_APPROVE_NO_DATA.exception();
+                throw ExceptionResultEnum.SERVICE_DING_NO_DATA.exception();
             }
             for (SysDingObj s : sysDingObjList) {
                 if (userArchivesRoleMap.containsKey(s.getRoleId())) {
@@ -175,7 +176,12 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
                 continue;
             }
 
-            List<Long> roleIsList = sysDingObjList.stream().map(s -> s.getRoleId()).collect(Collectors.toList());
+            //再找审核对象
+            List<SysDingObj> sysDingApproveObjList = sysDingObjService.list(new QueryWrapper<SysDingObj>().lambda().eq(SysDingObj::getDingGroupId, sysDingGroup.getId()).eq(SysDingObj::getType, DingObjTypeEnum.APPROVE));
+            if (CollectionUtils.isEmpty(sysDingApproveObjList)) {
+                throw ExceptionResultEnum.SERVICE_DING_APPROVE_NO_DATA.exception();
+            }
+            List<Long> roleIsList = sysDingApproveObjList.stream().map(s -> s.getRoleId()).collect(Collectors.toList());
             //首选查角色类型
             List<SysRole> sysRoleList = sysRoleService.listByIds(roleIsList);
             List<Long> sysRoleOtherList = new ArrayList<>();

sop-common/src/main/java/com/qmth/sop/common/enums/ExceptionResultEnum.java

@@ -103,6 +103,8 @@ public enum ExceptionResultEnum {
 
     SERVICE_DING_GROUP_NO_DATA(HttpStatus.INTERNAL_SERVER_ERROR, 5000038, "服务单元未设置考勤组"),
 
+    SERVICE_DING_NO_DATA(HttpStatus.INTERNAL_SERVER_ERROR, 5000039, "服务单元未设置考勤对象角色"),
+
     SERVICE_DING_APPROVE_NO_DATA(HttpStatus.INTERNAL_SERVER_ERROR, 5000039, "服务单元未设置考勤审核角色"),
 
     SERVICE_DING_APPROVE_USER_NO_DATA(HttpStatus.INTERNAL_SERVER_ERROR, 5000040, "服务单元未找到审核角色用户"),