Merge remote-tracking branch 'origin/dev_v3.2.2' into dev_v3.2.2

distributed-print/src/main/java/com/qmth/distributed/print/api/SysRoleController.java

@@ -74,6 +74,18 @@ public class SysRoleController {
         return ResultUtil.ok(sysRoleService.listToUser());
     }
 
+    /**
+     * 超管-角色管理
+     *
+     * @return
+     */
+    @ApiOperation(value = "超管-角色管理")
+    @RequestMapping(value = "/list_to_admin", method = RequestMethod.POST)
+    @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
+    public Result listToAdmin() {
+        return ResultUtil.ok(sysRoleService.listToAdmin());
+    }
+
     /**
      * 新增/修改
      *

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysRoleService.java

@@ -44,6 +44,7 @@ public interface SysRoleService extends IService<SysRole> {
     List<SysRole> list(Long[] roleIds, String name);
 
     List<SysRole> listToUser();
+    List<SysRole> listToAdmin();
 
     /**
      * 查询自定义角色

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysRoleServiceImpl.java

@@ -11,6 +11,7 @@ import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.FieldUniqueEnum;
 import com.qmth.teachcloud.common.enums.RoleSourceEnum;
+import com.qmth.teachcloud.common.enums.RoleTypeEnum;
 import com.qmth.teachcloud.common.mapper.SysRoleMapper;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -332,6 +333,16 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         return this.baseMapper.listRolesBySchoolId(Objects.nonNull(schoolId) ? Long.valueOf(schoolId) : null);
     }
 
+    @Override
+    public List<SysRole> listToAdmin() {
+        QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().isNull(SysRole::getSchoolId)
+                .ne(SysRole::getType, RoleTypeEnum.ADMIN)
+                .eq(SysRole::getEnable, true)
+                .orderByAsc(SysRole::getId);
+        return this.list(queryWrapper);
+    }
+
     /**
      * 查询自定义角色
      *
@@ -351,13 +362,6 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     public boolean builtin(Long id, boolean defaultRole) {
         SysRole sysRole = this.getById(id);
-        if (defaultRole) {
-            sysRole.setSource(RoleSourceEnum.SYS);
-            sysRole.setInterpret(RoleSourceEnum.SYS.getDesc());
-        } else {
-            sysRole.setSource(null);
-            sysRole.setInterpret(null);
-        }
         sysRole.setDefaultRole(defaultRole);
 
         commonCacheService.removeCustomRoleCache();