去掉多余角色

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

@@ -923,7 +923,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         // 查询用户角色是否包含命题老师
         List<SysRole> list = sysUserRoleService.listRoleByUserId(sysUser.getId());
-        boolean containsQuestionTeacher = list.stream().anyMatch(m -> RoleTypeEnum.QUESTION_TEACHER.equals(m.getType()));
+//        boolean containsQuestionTeacher = list.stream().anyMatch(m -> RoleTypeEnum.QUESTION_TEACHER.equals(m.getType()));
+        boolean containsQuestionTeacher = false;
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
@@ -1376,7 +1377,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         // 查询用户角色是否包含命题老师
         List<SysRole> list = sysUserRoleService.listRoleByUserId(sysUser.getId());
-        boolean containsQuestionTeacher = list.stream().filter(m -> RoleTypeEnum.QUESTION_TEACHER.equals(m.getType())).count() > 0;
+//        boolean containsQuestionTeacher = list.stream().filter(m -> RoleTypeEnum.QUESTION_TEACHER.equals(m.getType())).count() > 0;
+        boolean containsQuestionTeacher = false;
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         return this.baseMapper.listTaskPaper(schoolId, semesterId, examId, courseCode, paperNumber, cardRuleId, makeMethod, startTime, endTime, orgIds, containsQuestionTeacher, sysUser.getId());

distributed-print/src/test/java/com/qmth/distributed/print/BasicDataImportTest.java

@@ -3,15 +3,13 @@ package com.qmth.distributed.print;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.distributed.print.business.util.PdfUtil;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.*;
-import com.qmth.teachcloud.common.enums.RoleTypeEnum;
+import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.service.*;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.junit.Test;
-import org.junit.platform.commons.util.StringUtils;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -79,101 +77,101 @@ public class BasicDataImportTest {
         }
     }
 
-    @Test
-//    @Transactional
-    public void importBasicUser() throws Exception {
-        List<Map<String, String>> users = readUserFile();
-        for (Map<String, String> userMap : users) {
-            // sys_org
-            String orgCode = userMap.get("orgCode");
-            String orgName = userMap.get("orgName");
-            QueryWrapper<SysOrg> orgQueryWrapper = new QueryWrapper<>();
-            orgQueryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getCode, orgCode);
-            SysOrg sysOrg = sysOrgService.getOne(orgQueryWrapper);
-            if (sysOrg != null) {
-                if (!sysOrg.getName().equals(orgName)) {
-                    throw new Exception(String.format("s%代码已存在，名称不一致，数据库：s%，文件中：s%", orgCode, sysOrg.getName(), orgName));
-                }
-            } else {
-                sysOrg = new SysOrg();
-                sysOrg.setId(SystemConstant.getDbUuid());
-                sysOrg.setSchoolId(schoolId);
-                sysOrg.setCode(orgCode);
-                sysOrg.setName(orgName);
-                sysOrg.setParentId(100l);
-                sysOrgService.save(sysOrg);
-            }
-
-            // sys_user
-            String loginName = userMap.get("loginName");
-            String realName = userMap.get("realName");
-            String mobileNumber = userMap.get("mobileNumber");
-            String password = userMap.get("password");
-            QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
-            userQueryWrapper.lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getLoginName, loginName);
-            SysUser sysUser = sysUserService.getOne(userQueryWrapper);
-            if (sysUser == null) {
-                sysUser = new SysUser();
-                sysUser.setId(SystemConstant.getDbUuid());
-                sysUser.setSchoolId(schoolId);
-                sysUser.setLoginName(loginName);
-                sysUser.setRealName(realName);
-                sysUser.setPassword(password);
-                sysUser.setMobileNumber(mobileNumber);
-                sysUser.setOrgId(sysOrg.getId());
-                sysUserService.save(sysUser);
-            }
-
-            // sys_user_role
-            String roleType = userMap.get("roleType");
-            QueryWrapper<SysRole> roleQueryWrapper = new QueryWrapper<>();
-            roleQueryWrapper.lambda().eq(SysRole::getType, roleType);
-            SysRole sysRole = sysRoleService.getOne(roleQueryWrapper);
-            if (sysRole == null) {
-                throw new Exception("角色不存在");
-            }
-            QueryWrapper<SysRolePrivilege> rolePrivilegeQueryWrapper = new QueryWrapper<>();
-            rolePrivilegeQueryWrapper.lambda().eq(SysRolePrivilege::getRoleId, sysRole.getId()).eq(SysRolePrivilege::getEnable, true);
-            List<SysRolePrivilege> rolePrivileges = sysRolePrivilegeService.list(rolePrivilegeQueryWrapper);
-            List<SysUserRole> userRoles = new ArrayList<>();
-            for (SysRolePrivilege rolePrivilege : rolePrivileges) {
-                SysUserRole sysUserRole = new SysUserRole();
-                sysUserRole.setId(SystemConstant.getDbUuid());
-                sysUserRole.setUserId(sysUser.getId());
-                sysUserRole.setRoleId(rolePrivilege.getRoleId());
-                sysUserRole.setPrivilegeId(rolePrivilege.getPrivilegeId());
-                sysUserRole.setEnable(true);
-                userRoles.add(sysUserRole);
-            }
-            sysUserRoleService.saveBatch(userRoles);
-
-            // sys_user_course
-            String courseCodeses = userMap.get("courseCode");
-            if (roleType.equals(RoleTypeEnum.QUESTION_TEACHER.name())) {
-                if (StringUtils.isBlank(courseCodeses)) {
-                    throw new Exception("命题老师课程不能为空");
-                }
-
-                List<BasicUserCourse> userCourses = new ArrayList<>();
-                String[] courseCodes = courseCodeses.split(",");
-                for (String courseCode : courseCodes) {
-                    String[] coursees = courseCode.split("/");
-                    QueryWrapper<BasicCourse> basicCourseQueryWrapper = new QueryWrapper<>();
-                    basicCourseQueryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getCode, coursees[0]);
-                    BasicCourse basicCourse = basicCourseService.getOne(basicCourseQueryWrapper);
-                    if (basicCourse == null) {
-                        throw new Exception("命题老师对应课程不存在");
-                    }
-                    BasicUserCourse basicUserCourse = new BasicUserCourse();
-                    basicUserCourse.setId(SystemConstant.getDbUuid());
-                    basicUserCourse.setUserId(sysUser.getId());
-                    basicUserCourse.setCourseId(basicCourse.getId());
-                    userCourses.add(basicUserCourse);
-                }
-                basicUserCourseService.saveBatch(userCourses);
-            }
-        }
-    }
+//    @Test
+////    @Transactional
+//    public void importBasicUser() throws Exception {
+//        List<Map<String, String>> users = readUserFile();
+//        for (Map<String, String> userMap : users) {
+//            // sys_org
+//            String orgCode = userMap.get("orgCode");
+//            String orgName = userMap.get("orgName");
+//            QueryWrapper<SysOrg> orgQueryWrapper = new QueryWrapper<>();
+//            orgQueryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getCode, orgCode);
+//            SysOrg sysOrg = sysOrgService.getOne(orgQueryWrapper);
+//            if (sysOrg != null) {
+//                if (!sysOrg.getName().equals(orgName)) {
+//                    throw new Exception(String.format("s%代码已存在，名称不一致，数据库：s%，文件中：s%", orgCode, sysOrg.getName(), orgName));
+//                }
+//            } else {
+//                sysOrg = new SysOrg();
+//                sysOrg.setId(SystemConstant.getDbUuid());
+//                sysOrg.setSchoolId(schoolId);
+//                sysOrg.setCode(orgCode);
+//                sysOrg.setName(orgName);
+//                sysOrg.setParentId(100l);
+//                sysOrgService.save(sysOrg);
+//            }
+//
+//            // sys_user
+//            String loginName = userMap.get("loginName");
+//            String realName = userMap.get("realName");
+//            String mobileNumber = userMap.get("mobileNumber");
+//            String password = userMap.get("password");
+//            QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
+//            userQueryWrapper.lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getLoginName, loginName);
+//            SysUser sysUser = sysUserService.getOne(userQueryWrapper);
+//            if (sysUser == null) {
+//                sysUser = new SysUser();
+//                sysUser.setId(SystemConstant.getDbUuid());
+//                sysUser.setSchoolId(schoolId);
+//                sysUser.setLoginName(loginName);
+//                sysUser.setRealName(realName);
+//                sysUser.setPassword(password);
+//                sysUser.setMobileNumber(mobileNumber);
+//                sysUser.setOrgId(sysOrg.getId());
+//                sysUserService.save(sysUser);
+//            }
+//
+//            // sys_user_role
+//            String roleType = userMap.get("roleType");
+//            QueryWrapper<SysRole> roleQueryWrapper = new QueryWrapper<>();
+//            roleQueryWrapper.lambda().eq(SysRole::getType, roleType);
+//            SysRole sysRole = sysRoleService.getOne(roleQueryWrapper);
+//            if (sysRole == null) {
+//                throw new Exception("角色不存在");
+//            }
+//            QueryWrapper<SysRolePrivilege> rolePrivilegeQueryWrapper = new QueryWrapper<>();
+//            rolePrivilegeQueryWrapper.lambda().eq(SysRolePrivilege::getRoleId, sysRole.getId()).eq(SysRolePrivilege::getEnable, true);
+//            List<SysRolePrivilege> rolePrivileges = sysRolePrivilegeService.list(rolePrivilegeQueryWrapper);
+//            List<SysUserRole> userRoles = new ArrayList<>();
+//            for (SysRolePrivilege rolePrivilege : rolePrivileges) {
+//                SysUserRole sysUserRole = new SysUserRole();
+//                sysUserRole.setId(SystemConstant.getDbUuid());
+//                sysUserRole.setUserId(sysUser.getId());
+//                sysUserRole.setRoleId(rolePrivilege.getRoleId());
+//                sysUserRole.setPrivilegeId(rolePrivilege.getPrivilegeId());
+//                sysUserRole.setEnable(true);
+//                userRoles.add(sysUserRole);
+//            }
+//            sysUserRoleService.saveBatch(userRoles);
+//
+//            // sys_user_course
+//            String courseCodeses = userMap.get("courseCode");
+//            if (roleType.equals(RoleTypeEnum.QUESTION_TEACHER.name())) {
+//                if (StringUtils.isBlank(courseCodeses)) {
+//                    throw new Exception("命题老师课程不能为空");
+//                }
+//
+//                List<BasicUserCourse> userCourses = new ArrayList<>();
+//                String[] courseCodes = courseCodeses.split(",");
+//                for (String courseCode : courseCodes) {
+//                    String[] coursees = courseCode.split("/");
+//                    QueryWrapper<BasicCourse> basicCourseQueryWrapper = new QueryWrapper<>();
+//                    basicCourseQueryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getCode, coursees[0]);
+//                    BasicCourse basicCourse = basicCourseService.getOne(basicCourseQueryWrapper);
+//                    if (basicCourse == null) {
+//                        throw new Exception("命题老师对应课程不存在");
+//                    }
+//                    BasicUserCourse basicUserCourse = new BasicUserCourse();
+//                    basicUserCourse.setId(SystemConstant.getDbUuid());
+//                    basicUserCourse.setUserId(sysUser.getId());
+//                    basicUserCourse.setCourseId(basicCourse.getId());
+//                    userCourses.add(basicUserCourse);
+//                }
+//                basicUserCourseService.saveBatch(userCourses);
+//            }
+//        }
+//    }
 
     /**
      * 读取课程数据文件

distributed-print/src/test/java/com/qmth/distributed/print/BasicUserImportTest.java

@@ -76,113 +76,113 @@ public class BasicUserImportTest {
         }
     }
 
-    @Test
-//    @Transactional
-    public void importBasicUser() throws Exception {
-        List<Map<String, String>> users = readUserFile();
-        for (Map<String, String> userMap : users) {
-            // sys_org
-            String orgCode = userMap.get("orgCode");
-            String orgName = userMap.get("orgName");
-            QueryWrapper<SysOrg> orgQueryWrapper = new QueryWrapper<>();
-            orgQueryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getCode, orgCode);
-            SysOrg sysOrg = sysOrgService.getOne(orgQueryWrapper);
-            if (sysOrg != null) {
-                if (!sysOrg.getName().equals(orgName)) {
-                    throw new Exception(String.format("s%代码已存在，名称不一致，数据库：s%，文件中：s%", orgCode, sysOrg.getName(), orgName));
-                }
-            } else {
-                sysOrg = new SysOrg();
-                sysOrg.setId(SystemConstant.getDbUuid());
-                sysOrg.setSchoolId(schoolId);
-                sysOrg.setCode(orgCode);
-                sysOrg.setName(orgName);
-                sysOrg.setParentId(100l);
-                sysOrgService.save(sysOrg);
-            }
-
-            // sys_user
-            String loginName = userMap.get("loginName");
-            String realName = userMap.get("realName");
-            String mobileNumber = userMap.get("mobileNumber");
-            String password = userMap.get("password");
-            QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
-            userQueryWrapper.lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getLoginName, loginName);
-            SysUser sysUser = sysUserService.getOne(userQueryWrapper);
-            if (sysUser == null) {
-                sysUser = new SysUser();
-                sysUser.setId(SystemConstant.getDbUuid());
-                sysUser.setSchoolId(schoolId);
-                sysUser.setLoginName(loginName);
-                sysUser.setRealName(realName);
-                sysUser.setPassword(password);
-                sysUser.setMobileNumber(mobileNumber);
-                sysUser.setOrgId(sysOrg.getId());
-                sysUserService.save(sysUser);
-            } else {
-                sysUser.setEnable(true);
-                sysUser.setMobileNumber(mobileNumber);
-                sysUserService.updateById(sysUser);
-
-                String a = "update `sys_user` set mobile_number = %s, enable = true where id = %s;";
-                System.out.println(String.format(a, mobileNumber, sysUser.getId()));
-            }
-
-            // sys_user_role
-            String roleType = userMap.get("roleType");
-            QueryWrapper<SysRole> roleQueryWrapper = new QueryWrapper<>();
-            roleQueryWrapper.lambda().eq(SysRole::getType, roleType);
-            SysRole sysRole = sysRoleService.getOne(roleQueryWrapper);
-            if (sysRole == null) {
-                throw new Exception("角色不存在");
-            }
-
-            UpdateWrapper<SysUserRole> sysUserRoleUpdateWrapper = new UpdateWrapper<>();
-            sysUserRoleUpdateWrapper.lambda().eq(SysUserRole::getUserId, sysUser.getId());
-            sysUserRoleService.remove(sysUserRoleUpdateWrapper);
-
-            QueryWrapper<SysRolePrivilege> rolePrivilegeQueryWrapper = new QueryWrapper<>();
-            rolePrivilegeQueryWrapper.lambda().eq(SysRolePrivilege::getRoleId, sysRole.getId()).eq(SysRolePrivilege::getEnable, true);
-            List<SysRolePrivilege> rolePrivileges = sysRolePrivilegeService.list(rolePrivilegeQueryWrapper);
-            List<SysUserRole> userRoles = new ArrayList<>();
-            for (SysRolePrivilege rolePrivilege : rolePrivileges) {
-                SysUserRole sysUserRole = new SysUserRole();
-                sysUserRole.setId(SystemConstant.getDbUuid());
-                sysUserRole.setUserId(sysUser.getId());
-                sysUserRole.setRoleId(rolePrivilege.getRoleId());
-                sysUserRole.setPrivilegeId(rolePrivilege.getPrivilegeId());
-                sysUserRole.setEnable(true);
-                userRoles.add(sysUserRole);
-            }
-            sysUserRoleService.saveBatch(userRoles);
-
-            // sys_user_course
-            String courseCodeses = userMap.get("courseCode");
-            if (roleType.equals(RoleTypeEnum.QUESTION_TEACHER.name())) {
-                if (StringUtils.isBlank(courseCodeses)) {
-                    throw new Exception("命题老师课程不能为空");
-                }
-
-                List<BasicUserCourse> userCourses = new ArrayList<>();
-                String[] courseCodes = courseCodeses.split(",");
-                for (String courseCode : courseCodes) {
-                    String[] coursees = courseCode.split("/");
-                    QueryWrapper<BasicCourse> basicCourseQueryWrapper = new QueryWrapper<>();
-                    basicCourseQueryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getCode, coursees[0]);
-                    BasicCourse basicCourse = basicCourseService.getOne(basicCourseQueryWrapper);
-                    if (basicCourse == null) {
-                        throw new Exception("命题老师对应课程不存在," + coursees[0]);
-                    }
-                    BasicUserCourse basicUserCourse = new BasicUserCourse();
-                    basicUserCourse.setId(SystemConstant.getDbUuid());
-                    basicUserCourse.setUserId(sysUser.getId());
-                    basicUserCourse.setCourseId(basicCourse.getId());
-                    userCourses.add(basicUserCourse);
-                }
-                basicUserCourseService.saveBatch(userCourses);
-            }
-        }
-    }
+//    @Test
+////    @Transactional
+//    public void importBasicUser() throws Exception {
+//        List<Map<String, String>> users = readUserFile();
+//        for (Map<String, String> userMap : users) {
+//            // sys_org
+//            String orgCode = userMap.get("orgCode");
+//            String orgName = userMap.get("orgName");
+//            QueryWrapper<SysOrg> orgQueryWrapper = new QueryWrapper<>();
+//            orgQueryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getCode, orgCode);
+//            SysOrg sysOrg = sysOrgService.getOne(orgQueryWrapper);
+//            if (sysOrg != null) {
+//                if (!sysOrg.getName().equals(orgName)) {
+//                    throw new Exception(String.format("s%代码已存在，名称不一致，数据库：s%，文件中：s%", orgCode, sysOrg.getName(), orgName));
+//                }
+//            } else {
+//                sysOrg = new SysOrg();
+//                sysOrg.setId(SystemConstant.getDbUuid());
+//                sysOrg.setSchoolId(schoolId);
+//                sysOrg.setCode(orgCode);
+//                sysOrg.setName(orgName);
+//                sysOrg.setParentId(100l);
+//                sysOrgService.save(sysOrg);
+//            }
+//
+//            // sys_user
+//            String loginName = userMap.get("loginName");
+//            String realName = userMap.get("realName");
+//            String mobileNumber = userMap.get("mobileNumber");
+//            String password = userMap.get("password");
+//            QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
+//            userQueryWrapper.lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getLoginName, loginName);
+//            SysUser sysUser = sysUserService.getOne(userQueryWrapper);
+//            if (sysUser == null) {
+//                sysUser = new SysUser();
+//                sysUser.setId(SystemConstant.getDbUuid());
+//                sysUser.setSchoolId(schoolId);
+//                sysUser.setLoginName(loginName);
+//                sysUser.setRealName(realName);
+//                sysUser.setPassword(password);
+//                sysUser.setMobileNumber(mobileNumber);
+//                sysUser.setOrgId(sysOrg.getId());
+//                sysUserService.save(sysUser);
+//            } else {
+//                sysUser.setEnable(true);
+//                sysUser.setMobileNumber(mobileNumber);
+//                sysUserService.updateById(sysUser);
+//
+//                String a = "update `sys_user` set mobile_number = %s, enable = true where id = %s;";
+//                System.out.println(String.format(a, mobileNumber, sysUser.getId()));
+//            }
+//
+//            // sys_user_role
+//            String roleType = userMap.get("roleType");
+//            QueryWrapper<SysRole> roleQueryWrapper = new QueryWrapper<>();
+//            roleQueryWrapper.lambda().eq(SysRole::getType, roleType);
+//            SysRole sysRole = sysRoleService.getOne(roleQueryWrapper);
+//            if (sysRole == null) {
+//                throw new Exception("角色不存在");
+//            }
+//
+//            UpdateWrapper<SysUserRole> sysUserRoleUpdateWrapper = new UpdateWrapper<>();
+//            sysUserRoleUpdateWrapper.lambda().eq(SysUserRole::getUserId, sysUser.getId());
+//            sysUserRoleService.remove(sysUserRoleUpdateWrapper);
+//
+//            QueryWrapper<SysRolePrivilege> rolePrivilegeQueryWrapper = new QueryWrapper<>();
+//            rolePrivilegeQueryWrapper.lambda().eq(SysRolePrivilege::getRoleId, sysRole.getId()).eq(SysRolePrivilege::getEnable, true);
+//            List<SysRolePrivilege> rolePrivileges = sysRolePrivilegeService.list(rolePrivilegeQueryWrapper);
+//            List<SysUserRole> userRoles = new ArrayList<>();
+//            for (SysRolePrivilege rolePrivilege : rolePrivileges) {
+//                SysUserRole sysUserRole = new SysUserRole();
+//                sysUserRole.setId(SystemConstant.getDbUuid());
+//                sysUserRole.setUserId(sysUser.getId());
+//                sysUserRole.setRoleId(rolePrivilege.getRoleId());
+//                sysUserRole.setPrivilegeId(rolePrivilege.getPrivilegeId());
+//                sysUserRole.setEnable(true);
+//                userRoles.add(sysUserRole);
+//            }
+//            sysUserRoleService.saveBatch(userRoles);
+//
+//            // sys_user_course
+//            String courseCodeses = userMap.get("courseCode");
+//            if (roleType.equals(RoleTypeEnum.QUESTION_TEACHER.name())) {
+//                if (StringUtils.isBlank(courseCodeses)) {
+//                    throw new Exception("命题老师课程不能为空");
+//                }
+//
+//                List<BasicUserCourse> userCourses = new ArrayList<>();
+//                String[] courseCodes = courseCodeses.split(",");
+//                for (String courseCode : courseCodes) {
+//                    String[] coursees = courseCode.split("/");
+//                    QueryWrapper<BasicCourse> basicCourseQueryWrapper = new QueryWrapper<>();
+//                    basicCourseQueryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getCode, coursees[0]);
+//                    BasicCourse basicCourse = basicCourseService.getOne(basicCourseQueryWrapper);
+//                    if (basicCourse == null) {
+//                        throw new Exception("命题老师对应课程不存在," + coursees[0]);
+//                    }
+//                    BasicUserCourse basicUserCourse = new BasicUserCourse();
+//                    basicUserCourse.setId(SystemConstant.getDbUuid());
+//                    basicUserCourse.setUserId(sysUser.getId());
+//                    basicUserCourse.setCourseId(basicCourse.getId());
+//                    userCourses.add(basicUserCourse);
+//                }
+//                basicUserCourseService.saveBatch(userCourses);
+//            }
+//        }
+//    }
 
     /**
      * 读取课程数据文件

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/RoleTypeEnum.java

@@ -5,22 +5,18 @@ import java.util.List;
 
 /**
  * 角色类型
+ *
  * @Date: 2021/3/23.
  */
 public enum RoleTypeEnum {
 
     ADMIN("系统管理员"),
     SCHOOL_ADMIN("学校管理员"),
-    EXAM_TEACHER("考务老师"),
-    QUESTION_TEACHER("命题老师"),
-    CUSTOMER("客服员"),
-    PRINTER("印刷员"),
-    CUSTOM("自定义"),
     OFFICE_TEACHER("教务处老师"),
     PRESIDENT("学院院长"),
-    TEACHER("任课老师"),
-    MARKER("评卷员"),
-    MARKER_LEADER("课组长");
+    TEACHER("任课老师");
+//    MARKER("评卷员"),
+//    MARKER_LEADER("课组长");
 
     RoleTypeEnum(String desc) {
         this.desc = desc;
@@ -54,10 +50,11 @@ public enum RoleTypeEnum {
 
     /**
      * 根据desc查找枚举类
+     *
      * @param desc desc
      * @return 枚举类
      */
-    public static RoleTypeEnum convertDescToEnum(String desc){
+    public static RoleTypeEnum convertDescToEnum(String desc) {
         RoleTypeEnum res = null;
         for (RoleTypeEnum value : RoleTypeEnum.values()) {
             if (desc.equals(value.getDesc())) {

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

@@ -106,18 +106,14 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
             role.setUpdateId(sysUser.getId());
             role.setUpdateTime(System.currentTimeMillis());
 
-//            if (RoleTypeEnum.CUSTOM.equals(role.getType())) {
             //删除权限
             sysRolePrivilegeService.removeByRoleId(role.getId());
-//            }
             isSuccess = this.updateById(role);
 
         }
 
-//        if (RoleTypeEnum.CUSTOM.equals(role.getType())) {
         // 新增权限
         sysRolePrivilegeService.saveBatch(role);
-//        }
 
         // 更新sys_user_role
         sysUserRoleService.rebindPrivileges(role.getId());

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

@@ -287,7 +287,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             List<Long> userRoles = sysRoleService.getUserRoles(sysUser.getId());
             List<SysRole> sysRoleList = sysRoleService.list(new QueryWrapper<SysRole>().lambda().in(SysRole::getId, userRoles));
             Set<RoleTypeEnum> roleType = sysRoleList.stream().map(SysRole::getType).collect(Collectors.toSet());
-            if (roleType.contains(RoleTypeEnum.ADMIN) || roleType.contains(RoleTypeEnum.CUSTOMER)) {
+            if (roleType.contains(RoleTypeEnum.ADMIN)) {
                 schoolCode = SystemConstant.ADMIN_CODE;
             }
         } else {
@@ -356,19 +356,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 list.add(userRole);
             }
         }
-
-//        // 角色里是否有考务老师角色
-//        List<SysRole> sysRoles = sysRoleService.list(roleIds, RoleTypeEnum.QUESTION_TEACHER.name());
-//        if (sysRoles != null && sysRoles.size() > 0) {
-//            Long[] courseIds = sysUser.getCourseIds();
-//            if (courseIds.length == 0) {
-//                throw ExceptionResultEnum.ERROR.exception("请选择课程");
-//            }
-//
-//            basicUserCourseService.removeByUserId(sysUser.getId());
-//            basicUserCourseService.saveBatch(sysUser);
-//
-//        }
         return sysUserRoleService.saveBatch(list);
     }
 
@@ -590,19 +577,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 }
 
             }
-//            //用户科目全量删除全量增加
-//            QueryWrapper<BasicUserCourse> basicUserCourseQueryWrapper = new QueryWrapper<>();
-//            basicUserCourseQueryWrapper.lambda().eq(BasicUserCourse::getUserId, sysUser.getId());
-//            basicUserCourseService.remove(basicUserCourseQueryWrapper);
-//
-//            List<SysRole> sysRoles = sysRoleService.list(sysUser.getRoleIds(), RoleTypeEnum.QUESTION_TEACHER.name());
-//            if (sysRoles != null && sysRoles.size() > 0) {
-//                Long[] courseIds = sysUser.getCourseIds();
-//                if (courseIds.length == 0) {
-//                    throw ExceptionResultEnum.ERROR.exception("请选择课程");
-//                }
-//                basicUserCourseService.saveBatch(sysUser);
-//            }
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
             isSuccess = false;
@@ -694,19 +668,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     }
                 }
             }
-//            //用户科目全量删除全量增加
-//            QueryWrapper<BasicUserCourse> basicUserCourseQueryWrapper = new QueryWrapper<>();
-//            basicUserCourseQueryWrapper.lambda().eq(BasicUserCourse::getUserId, sysUser.getId());
-//            basicUserCourseService.remove(basicUserCourseQueryWrapper);
-//
-//            List<SysRole> sysRoles = sysRoleService.list(sysUser.getRoleIds(), RoleTypeEnum.QUESTION_TEACHER.name());
-//            if (sysRoles != null && sysRoles.size() > 0) {
-//                Long[] courseIds = sysUser.getCourseIds();
-//                if (courseIds.length == 0) {
-//                    throw ExceptionResultEnum.ERROR.exception("请选择课程");
-//                }
-//                basicUserCourseService.saveBatch(sysUser);
-//            }
         } catch (Exception e) {
             log.error(SystemConstant.LOG_ERROR, e);
             isSuccess = false;

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysController.java

@@ -126,7 +126,7 @@ public class SysController {
                 AuthBean authBean = teachcloudCommonService.getUserAuth(o.getId());
                 if (Objects.nonNull(authBean) && Objects.nonNull(authBean.getRoleList()) && authBean.getRoleList().size() > 0) {
                     Set<RoleTypeEnum> roleType = authBean.getRoleList().stream().map(s -> s.getType()).collect(Collectors.toSet());
-                    if (!roleType.contains(RoleTypeEnum.ADMIN) && !roleType.contains(RoleTypeEnum.CUSTOMER)) {
+                    if (!roleType.contains(RoleTypeEnum.ADMIN)) {
                         throw ExceptionResultEnum.ERROR.exception("学校代码为admin只允许超级管理员登录");
                     }
                 }