3.2.7 bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/PrintCommonService.java

@@ -15,7 +15,6 @@ import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ClassifyEnum;
-import com.qmth.teachcloud.common.enums.PushTypeEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
 import com.qmth.teachcloud.common.enums.UploadFileEnum;
 import org.springframework.scheduling.annotation.Async;
@@ -195,11 +194,12 @@ public interface PrintCommonService {
      *
      * @param schoolId
      * @param printPlanId
+     * @param examId
      * @param courseCode
      * @param paperNumber
      * @return
      */
-    Boolean checkExamDetailStatus(Long schoolId, Long printPlanId, String courseCode, String paperNumber);
+    Boolean checkExamDetailStatus(Long schoolId, Long printPlanId, Long examId, String courseCode, String paperNumber);
 
     /**
      * 生成唯一的试卷编号

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamPaperStructureServiceImpl.java

@@ -21,6 +21,7 @@ import com.qmth.distributed.print.business.enums.ExamPaperStructureStatusTypeEnu
 import com.qmth.distributed.print.business.enums.ExamTaskSyncStatusEnum;
 import com.qmth.distributed.print.business.mapper.ExamPaperStructureMapper;
 import com.qmth.distributed.print.business.service.*;
+import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.bean.dto.UserRoleDto;
 import com.qmth.teachcloud.common.bean.dto.stmms.ExamCloudPaperStructDto;
@@ -108,13 +109,25 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
     @Resource
     ExamPaperClassMarkerService examPaperClassMarkerService;
 
+    @Resource
+    CommonCacheService commonCacheService;
+
     @Override
     public IPage<ExamPaperStructurePageDto> listByPropositionTeacherId(Long semesterId, Long examId, Integer pageNumber, Integer pageSize, Boolean ready) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, sysUser.getId(), ServletUtil.getRequest().getServletPath());
+        String url = "/api/admin/exam/structure/list";
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, sysUser.getId(), url);
         Page<ExamPaperStructure> page = new Page<>(pageNumber, pageSize);
-        IPage<ExamPaperStructurePageDto> examPaperStructureIPage = this.baseMapper.listByPropositionTeacherId(page, schoolId, semesterId, examId, ExamTaskSyncStatusEnum.FINISH.name(), ready, dpr);
+        String syncStatus = ExamTaskSyncStatusEnum.FINISH.name();
+        // 查看是否有评卷参数管理权限
+        AuthBean authBean = commonCacheService.userAuthCache(sysUser.getId());
+        Set<String> urls = authBean.getUrls();
+        int privilegeCount = Objects.nonNull(urls) ? (int) urls.stream().filter(s -> s.equalsIgnoreCase(url)).count() : 0;
+        if (privilegeCount == 0) {
+            syncStatus = null;
+        }
+        IPage<ExamPaperStructurePageDto> examPaperStructureIPage = this.baseMapper.listByPropositionTeacherId(page, schoolId, semesterId, examId, syncStatus, ready, dpr);
         examPaperStructureIPage.getRecords().forEach(m -> {
             // 试卷结构同步任务状态
             if (m.getId() != null) {
@@ -338,7 +351,8 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
     public long countByPropositionTeacherId(Boolean ready) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        List<ExamPaperStructure> examPaperStructureList = this.baseMapper.listByPropositionTeacherId(schoolId, null, null, sysUser.getId(), ExamTaskSyncStatusEnum.FINISH.name(), ready, null);
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, sysUser.getId(), "/api/admin/exam/structure/list");
+        List<ExamPaperStructure> examPaperStructureList = this.baseMapper.listByPropositionTeacherId(schoolId, null, null, sysUser.getId(), ExamTaskSyncStatusEnum.FINISH.name(), ready, dpr);
         return CollectionUtils.isEmpty(examPaperStructureList) ? 0 : examPaperStructureList.size();
     }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskDetailServiceImpl.java

@@ -188,7 +188,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
         ExamPrintPlan examPrintPlan = examPrintPlanService.getById(paperParam.getPrintPlanId());
         ExamTask examTask = examTaskService.getById(paperParam.getExamTaskId());
         // 校验课程关联考场，是否已经提交打印
-        Boolean isCreate = printCommonService.checkExamDetailStatus(examTask.getSchoolId(), examPrintPlan.getId(), examTask.getCourseCode(), examTask.getPaperNumber());
+        Boolean isCreate = printCommonService.checkExamDetailStatus(examTask.getSchoolId(), examPrintPlan.getId(), examTask.getExamId(), examTask.getCourseCode(), examTask.getPaperNumber());
         if (isCreate) {
             // 提交印刷的考场，不允许修改关联试卷
             List<ExamDetail> examDetails = examDetailService.listByPrintPlanIdAndCourseCodeAndPaperNumber(examTask.getSchoolId(), paperParam.getPrintPlanId(), examTask.getCourseCode(), examTask.getPaperNumber());
@@ -571,6 +571,11 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
 //                    mapVar.put(SystemConstant.SEND_FLOW_MQ, true);
 //                }
 //            }
+        } else {
+            // 不需要审核
+            UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.lambda().set(ExamTask::getStatus, ExamStatusEnum.STAGE).eq(ExamTask::getId, examTaskDetail.getExamTaskId());
+            examTaskService.update(updateWrapper);
         }
         mapVar.put(SystemConstant.SUCCESS, true);
         return mapVar;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/PrintCommonServiceImpl.java

@@ -49,6 +49,7 @@ import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.swing.plaf.basic.BasicTableUI;
 import java.io.*;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
@@ -701,7 +702,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
     private void validateOrg(Long id) {
         // 机构下是否有用户
         List<SysUser> sysUsers = sysUserService.listByOrgId(id);
-        if (sysUsers != null && sysUsers.size() > 0) {
+        if (!CollectionUtils.isEmpty(sysUsers)) {
             throw ExceptionResultEnum.ERROR.exception("该机构下有用户，不能删除");
         }
 
@@ -709,16 +710,17 @@ public class PrintCommonServiceImpl implements PrintCommonService {
         QueryWrapper<SysOrg> orgQueryWrapper = new QueryWrapper<>();
         orgQueryWrapper.lambda().eq(SysOrg::getParentId, id);
         List<SysOrg> sysOrgs = sysOrgService.list(orgQueryWrapper);
-        if (sysOrgs != null && sysOrgs.size() > 0) {
+        if (!CollectionUtils.isEmpty(sysOrgs)) {
             throw ExceptionResultEnum.ERROR.exception("该机构下有子机构，不能删除");
         }
 
-//        QueryWrapper<BasicTemplateOrg> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.lambda().eq(BasicTemplateOrg::getOrgId, id);
-//        List<BasicTemplateOrg> basicTemplateOrgs = basicTemplateOrgService.list(queryWrapper);
-//        if (basicTemplateOrgs != null && basicTemplateOrgs.size() > 0) {
-//            throw ExceptionResultEnum.ERROR.exception("机构已绑定，不能删除");
-//        }
+        // 机构下是否有子机构
+        QueryWrapper<BasicStudent> basicStudentQueryWrapper = new QueryWrapper<>();
+        basicStudentQueryWrapper.lambda().eq(BasicStudent::getBelongOrgId, id);
+        List<BasicStudent> basicStudentList = basicStudentService.list(basicStudentQueryWrapper);
+        if (!CollectionUtils.isEmpty(basicStudentList)) {
+            throw ExceptionResultEnum.ERROR.exception("该机构下有学生，不能删除");
+        }
     }
 
     /**
@@ -913,18 +915,19 @@ public class PrintCommonServiceImpl implements PrintCommonService {
      *
      * @param schoolId
      * @param printPlanId
+     * @param examId
      * @param courseCode
      * @param paperNumber
      * @return
      */
     @Override
-    public Boolean checkExamDetailStatus(Long schoolId, Long printPlanId, String courseCode, String paperNumber) {
+    public Boolean checkExamDetailStatus(Long schoolId, Long printPlanId, Long examId, String courseCode, String paperNumber) {
         List<ExamDetail> examDetails;
         ExamPrintPlan examPrintPlan = examPrintPlanService.getById(printPlanId);
         if (printPlanId != null) {
             examDetails = examDetailService.listByPrintPlanIdAndCourseCodeAndPaperNumber(schoolId, printPlanId, courseCode, paperNumber);
         } else {
-            examDetails = examDetailService.listByCourseCodeAndPaperNumber(schoolId, examPrintPlan.getExamId(), courseCode, paperNumber);
+            examDetails = examDetailService.listByCourseCodeAndPaperNumber(schoolId, examId, courseCode, paperNumber);
         }
         if (examDetails != null && examDetails.size() > 0) {
             long count = examDetails.stream().filter(m -> !ExamDetailStatusEnum.NEW.name().equals(m.getStatus().name()) && !ExamDetailStatusEnum.READY.name().equals(m.getStatus().name())).count();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncSysUserDataImportService.java

@@ -54,15 +54,14 @@ public class AsyncSysUserDataImportService extends AsyncImportTaskTemplete {
             // 执行导入基础用户数据
             Map<String, Object> result = taskLogicService.executeImportSysUserLogic(map);
 
+            tbTask.setResult(TaskResultEnum.SUCCESS);
             //错误数据，生成文件
             if (result.containsKey(SystemConstant.ERROR_DATA_LIST)) {
-                tbTask.setResult(TaskResultEnum.ERROR);
                 List<SysUserErrorExportDto> errorDataList = (List<SysUserErrorExportDto>) result.get(SystemConstant.ERROR_DATA_LIST);
                 if (CollectionUtils.isNotEmpty(errorDataList)) {
+                    tbTask.setResult(TaskResultEnum.ERROR);
                     super.createErrorFile(tbTask, SysUserErrorExportDto.class, errorDataList);
                 }
-            } else {
-                tbTask.setResult(TaskResultEnum.SUCCESS);
             }
 
 //            // 执行用户同步数据

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -1540,14 +1540,14 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     }
 
                     if (Objects.nonNull(code) && !code.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
-                        errorStringJoiner.add("[工号]不符合规范");
+                        errorStringJoiner.add("工号[" + code + "]不符合规范");
                     }
                     if (Objects.nonNull(phoneNumber) && !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)) {
-                        errorStringJoiner.add("[手机号]不符合输入规范");
+                        errorStringJoiner.add("手机号[" + phoneNumber + "]不符合输入规范");
                     }
                     if (Objects.nonNull(phoneNumber)) {
                         if (phoneNumberMap.containsKey(phoneNumber)) {
-                            errorStringJoiner.add("excel中的[手机号]不能重复");
+                            errorStringJoiner.add("excel中的手机号[" + phoneNumber + "]不能重复");
                         } else {
                             phoneNumberMap.put(phoneNumber, y);
                         }

distributed-print-business/src/main/resources/db/log/脚本-xiaof.sql

@@ -307,3 +307,15 @@ UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('330', '重新生成pdf', 'CreatePdf', 'LINK', '47', '6', 'AUTH', '190', '1', '0', '1');
 UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '857');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('140', '模糊查询-试卷编号', '/api/admin/exam/task/paper_number_query', 'URL', '136', '4', 'SYS', '1', '1', '1');
+
+
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '357');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '359');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '360');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '361');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '372');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '373');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '374');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '375');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '376');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '391');

distributed-print-business/src/main/resources/db/upgrade/3.2.7.sql

@@ -213,3 +213,14 @@ UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('330', '重新生成pdf', 'CreatePdf', 'LINK', '47', '6', 'AUTH', '190', '1', '0', '1');
 UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '857');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('140', '模糊查询-试卷编号', '/api/admin/exam/task/paper_number_query', 'URL', '136', '4', 'SYS', '1', '1', '1');
+
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '357');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '359');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '360');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '361');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '372');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '373');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '374');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '375');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '376');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '391');

distributed-print-business/src/main/resources/mapper/ExamPaperStructureMapper.xml

@@ -67,7 +67,12 @@
                 and be.id = #{examId}
             </if>
             <if test="ready != null">
-                and eps.is_finish = #{ready}
+                <if test="ready == false">
+                    and (eps.is_finish = #{ready} or eps.is_finish is null)
+                </if>
+                <if test="ready == true">
+                    and eps.is_finish = #{ready}
+                </if>
             </if>
             <if test="dpr != null">
                 <if test="dpr.requestUserId != null">

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

@@ -116,7 +116,7 @@ public class ExamTaskQueryController {
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
             ExamTask examTask = examTaskService.getById(examTaskDetail.getId());
             // 校验课程关联考场，是否已经提交打印
-            Boolean isCreate = printCommonService.checkExamDetailStatus(examTask.getSchoolId(), null, examTask.getCourseCode(), examTask.getPaperNumber());
+            Boolean isCreate = printCommonService.checkExamDetailStatus(examTask.getSchoolId(), null, examTask.getExamId(), examTask.getCourseCode(), examTask.getPaperNumber());
             // 校验是否可以提交打印状态
             if (isCreate) {
                 printCommonService.checkData(examTask.getSchoolId(), examTask.getExamId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/SysRoleMapper.java

@@ -23,4 +23,6 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
     IPage<SysRole> listPage(Page<SysRole> page, @Param("schoolId") Long schoolId, @Param("name") String name, @Param("enable") Boolean enable);
 
     List<SysRole> listRolesBySchoolId(@Param("schoolId") Long schoolId);
+
+    List<SysRole> getByRoleName(@Param("schoolId") Long schoolId, @Param("roleName") String roleName);
 }

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

@@ -55,4 +55,6 @@ public interface SysRoleService extends IService<SysRole> {
     List<SysRole> findCustomRole();
 
     boolean builtin(Long id, boolean defaultRole);
+
+    List<SysRole> getByRoleName(String roleName);
 }

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

@@ -7,6 +7,7 @@ import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicRoleDataPermission;
 import com.qmth.teachcloud.common.entity.SysPrivilege;
+import com.qmth.teachcloud.common.entity.SysRole;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.DataPermissionTypeEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -194,10 +195,16 @@ public class BasicRoleDataPermissionServiceImpl extends ServiceImpl<BasicRoleDat
         PrivilegeEnum type = privilege.getType();
         // 如果是菜单，搜索该菜单是否绑定了数据权限
         if (PrivilegeEnum.MENU.equals(type)) {
-            BasicRoleDataPermission basicRoleDataPermission = this.getOne(new QueryWrapper<BasicRoleDataPermission>().lambda()
-                    .eq(BasicRoleDataPermission::getSchoolId, schoolId)
-                    .eq(BasicRoleDataPermission::getRoleId, roleId)
-                    .eq(BasicRoleDataPermission::getPrivilegeId, privilegeId));
+            SysRole sysRole = sysRoleService.getById(roleId);
+            QueryWrapper<BasicRoleDataPermission> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(BasicRoleDataPermission::getRoleId, roleId)
+                    .eq(BasicRoleDataPermission::getPrivilegeId, privilegeId);
+            if (sysRole.getDefaultRole()) {
+                queryWrapper.lambda().isNull(BasicRoleDataPermission::getSchoolId);
+            } else {
+                queryWrapper.lambda().eq(BasicRoleDataPermission::getSchoolId, schoolId);
+            }
+            BasicRoleDataPermission basicRoleDataPermission = this.getOne(queryWrapper);
             if (Objects.nonNull(basicRoleDataPermission)) {
                 // 有数据权限
                 return basicRoleDataPermission.getDataPermissionType();

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

@@ -420,18 +420,37 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
         basicStudent.setSchoolId(schoolId);
         basicStudent.setOrgId(collegeId);
 
-        BasicStudent checkCode = this.getOne(new QueryWrapper<BasicStudent>().lambda()
-                .eq(BasicStudent::getSchoolId, schoolId)
-                .eq(BasicStudent::getStudentCode, studentCode));
-        if (checkCode != null) {
-            basicStudent.setId(checkCode.getId());
-            // 禁用的学生，此时启用
-            basicStudent.setEnable(true);
-            basicStudent.updateInfo(sysUser.getId());
+        if (basicStudentParams.getId() != null) {
+            if (!studentCode.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
+                throw ExceptionResultEnum.ERROR.exception("学号[" + studentCode + "]不符合规范");
+            }
+            BasicStudent basicStudentOld = this.getById(basicStudentParams.getId());
+            if (!basicStudentOld.getStudentCode().equals(studentCode)) {
+                List<BasicStudent> checkCodeList = this.list(new QueryWrapper<BasicStudent>().lambda()
+                        .eq(BasicStudent::getSchoolId, schoolId)
+                        .eq(BasicStudent::getStudentCode, studentCode)
+                        .ne(BasicStudent::getId, basicStudentParams.getId()));
+                if (!CollectionUtils.isEmpty(checkCodeList)) {
+                    throw ExceptionResultEnum.ERROR.exception("学号[" + studentCode + "]已存在");
+                }
+            }
+
+            basicStudent.setId(basicStudentParams.getId());
         } else {
-            basicStudent.setId(SystemConstant.getDbUuid());
-            basicStudent.insertInfo(sysUser.getId());
+            BasicStudent checkCode = this.getOne(new QueryWrapper<BasicStudent>().lambda()
+                    .eq(BasicStudent::getSchoolId, schoolId)
+                    .eq(BasicStudent::getStudentCode, studentCode));
+            if (checkCode != null) {
+                basicStudent.setId(checkCode.getId());
+                // 禁用的学生，此时启用
+                basicStudent.setEnable(true);
+                basicStudent.updateInfo(sysUser.getId());
+            } else {
+                basicStudent.setId(SystemConstant.getDbUuid());
+                basicStudent.insertInfo(sysUser.getId());
+            }
         }
+
         return basicStudent;
     }
 }

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

@@ -91,15 +91,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
             role.setName(sysRolePrivilegeParams.getName());
             role.setPrivilegeIds(sysRolePrivilegeParams.getPrivilegeIds().stream().map(SystemConstant::convertIdToLong).toArray(Long[]::new));
             role.setDefaultRole(sysRolePrivilegeParams.getDefaultRole() == null ? false : sysRolePrivilegeParams.getDefaultRole());
-            if (role.getDefaultRole()) {
-                role.setSource(RoleSourceEnum.SYS);
-                role.setInterpret("系统内置");
-            }else {
-                role.setInterpret(sysRolePrivilegeParams.getInterpret());
-            }
             // 内置角色学校为null
             role.setSchoolId(role.getDefaultRole() ? null : schoolId);
-
             List<SysRole> sysRoleList = this.list();
             // 内置角色检验
             if (role.getDefaultRole()) {
@@ -130,12 +123,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
             //编辑
             if (Objects.nonNull(role.getId())) {
+                if (!role.getDefaultRole()) {
+                    role.setInterpret(sysRolePrivilegeParams.getInterpret());
+                }
                 role.updateInfo(sysUser.getId());
                 sysRoleService.updateById(role);
                 commonCacheService.updateRoleCache(role.getId());
-
                 boolean isChange = sysRolePrivilegeService.saveBatch(role);//角色权限
-
                 if (isChange) {
                     commonCacheService.updateRolePrivilegeCache(role.getId());
                     //绑定该角色的用户都需要清除鉴权缓存
@@ -144,6 +138,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                 }
             } else {
                 role.insertInfo(sysUser.getId());
+                if (role.getDefaultRole()) {
+                    role.setSource(RoleSourceEnum.SYS);
+                    role.setInterpret("系统内置");
+                } else {
+                    role.setInterpret(sysRolePrivilegeParams.getInterpret());
+                }
                 sysRoleService.save(role);
                 sysRolePrivilegeService.saveBatch(role);//角色权限
                 commonCacheService.updateCustomRoleCache();
@@ -390,4 +390,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         commonCacheService.removeCustomRoleCache();
         return this.updateById(sysRole);
     }
+
+    @Override
+    public List<SysRole> getByRoleName(String roleName) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        return this.baseMapper.getByRoleName(schoolId, roleName);
+    }
 }

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

@@ -755,7 +755,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<SysUserErrorExportDto> errorDataList = JSON.parseArray(JSON.toJSONString(map.get(SystemConstant.ERROR_DATA_LIST)), SysUserErrorExportDto.class);
         if (Objects.isNull(errorDataList)) {
             errorDataList = new ArrayList<>();
-            map.put(SystemConstant.ERROR_DATA_LIST,errorDataList);
+            map.put(SystemConstant.ERROR_DATA_LIST, errorDataList);
         }
 
         SysUser requestUser = (SysUser) map.get(SystemConstant.SYS_USER);
@@ -783,7 +783,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                         String orgName = sysUserImportDto.getOrgName();
                         if (!orgInfoMap.containsKey(orgName)) {
                             // 系统异常
-                            throw ExceptionResultEnum.ERROR.exception("在解析的机构map集合中，没有找到excel数据中的用户机构名称【" + orgName + "】");
+                            throw ExceptionResultEnum.ERROR.exception("系统中未查询到机构名称[" + orgName + "]");
                         }
                         // 直接解析机构id
                         Long orgId = orgInfoMap.get(orgName);
@@ -1296,26 +1296,24 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     /**
      * 根据角色名称获取角色id集合
      *
-     * @param schoolId 学校id
-     * @param roleName 角色名称组
+     * @param schoolId  学校id
+     * @param roleNames 角色名称组
      * @return 角色集合
      */
-    private LinkedHashSet<Long> analyzeRoleName(Long schoolId, String roleName) {
+    private LinkedHashSet<Long> analyzeRoleName(Long schoolId, String roleNames) {
         LinkedHashSet<Long> roleIdList = new LinkedHashSet<>();
-        String[] arr = roleName.split(SystemConstant.COMMA);
+        String[] arr = roleNames.split(SystemConstant.COMMA);
         for (String cell : arr) {
-            QueryWrapper<SysRole> sysRoleQueryWrapper = new QueryWrapper<>();
-            sysRoleQueryWrapper.lambda().eq(SysRole::getEnable, true)
-                    .eq(SysRole::getName, cell.trim());
-            if (Objects.isNull(RoleTypeEnum.convertDescToEnum(cell.trim()))) {
-                // 自定义角色带学校id查
-                sysRoleQueryWrapper.lambda().eq(SysRole::getSchoolId, schoolId);
-            }
-            SysRole sysRole = sysRoleService.getOne(sysRoleQueryWrapper);
-            if (Objects.isNull(sysRole)) {
-                throw ExceptionResultEnum.ERROR.exception("系统中不存在excel导入的角色【" + cell.trim() + "】");
+            String roleName = cell.trim();
+            List<SysRole> sysRoles = sysRoleService.getByRoleName(roleName);
+            if (CollectionUtils.isEmpty(sysRoles)) {
+                throw ExceptionResultEnum.ERROR.exception("角色[" + roleName + "]不存在");
+            } else if (sysRoles.size() > 1) {
+                throw ExceptionResultEnum.ERROR.exception("角色[" + roleName + "]查询到多条数据，请联系管理员处理");
+            } else if (!sysRoles.get(0).getEnable()) {
+                throw ExceptionResultEnum.ERROR.exception("角色[" + roleName + "]已禁用");
             }
-            roleIdList.add(sysRole.getId());
+            roleIdList.add(sysRoles.get(0).getId());
         }
         return roleIdList;
     }

teachcloud-common/src/main/resources/mapper/SysRoleMapper.xml

@@ -14,11 +14,13 @@
         <result column="update_id" property="updateId" />
         <result column="update_time" property="updateTime" />
         <result column="default_role" property="defaultRole" />
+        <result column="source" property="source" />
+        <result column="interpret" property="interpret" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        select t.id, t.school_id, t.name, t.enable, t.type, t.create_id, t.create_time, t.update_id, t.update_time, t.default_role, t.interpret from sys_role t
+        select t.id, t.school_id, t.name, t.enable, t.type, t.create_id, t.create_time, t.update_id, t.update_time, t.default_role, t.source, t.interpret from sys_role t
     </sql>
 
     <select id="listRolesByUserId" resultMap="BaseResultMap">
@@ -91,4 +93,15 @@
         <include refid="Base_Column_List" />
         where t.default_role = 1 and (t.type = 'SCHOOL_ADMIN' or t.type = 'SCHOOL_TEACHER' or t.type = 'ASSISTANT')
     </select>
+    <select id="getByRoleName" resultMap="BaseResultMap">
+        SELECT
+            *
+        FROM
+            sys_role
+        WHERE
+            name = #{roleName}
+          AND ((school_id IS NULL
+            AND default_role = TRUE)
+            OR school_id = #{schoolId})
+    </select>
 </mapper>