修改entity

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

@@ -124,7 +124,9 @@ 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)
+//                            && !roleType.contains(RoleTypeEnum.CUSTOMER)
+                    ) {
                         throw ExceptionResultEnum.ERROR.exception("学校代码为admin只允许超级管理员登录");
                     }
                 }

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

@@ -14,10 +14,7 @@ import com.qmth.teachcloud.common.entity.SysUserRole;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.FieldUniqueEnum;
 import com.qmth.teachcloud.common.mapper.SysRoleMapper;
-import com.qmth.teachcloud.common.service.CacheService;
-import com.qmth.teachcloud.common.service.SysRolePrivilegeService;
-import com.qmth.teachcloud.common.service.SysRoleService;
-import com.qmth.teachcloud.common.service.SysUserRoleService;
+import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +52,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Resource
     SysRoleService sysRoleService;
 
+//    @Autowired
+//    TeachcloudCommonService commonService;
+
     @Override
     public IPage<SysRole> list(String name, Boolean enable, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -126,6 +126,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     public boolean saveRoleNew(SysRole role) {
         try {
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+            Long schoolId = Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild()) ? Long.valueOf(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString()) : null;
+            if (Objects.isNull(schoolId) && Objects.isNull(role.getSchoolId())) {
+                role.setSchoolId(sysUser.getSchoolId());
+            } else if (Objects.nonNull(schoolId)) {
+                role.setSchoolId(schoolId);
+            }
             if (Objects.nonNull(role.getId())) {//编辑
                 List<SysRolePrivilege> sysRolePrivilegeList = cacheService.rolePrivilegeCache(role.getId());
                 int count = (int) sysRolePrivilegeList.stream().filter(s -> Arrays.asList(role.getPrivilegeIds()).contains(s.getPrivilegeId())).count();
@@ -138,6 +144,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                     sysRolePrivilegeService.saveBatch(role);
                     cacheService.updateRolePrivilegeCache(role.getId());
                 }
+//                commonService.removeUserInfo(user.getId());
             } else {
                 role.setCreateId(sysUser.getId());
                 sysRoleService.save(role);

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

@@ -167,18 +167,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
         }
 
-        // 角色里是否有考务老师角色
-        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);
-
-        }
+//        // 角色里是否有考务老师角色
+//        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);
     }
 
@@ -244,11 +244,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public SysUser findByForeignKey(Long schoolId, String teacherName) {
         List<SysUser> tbSchoolTeacherList = this.list(new QueryWrapper<SysUser>().lambda()
-                .eq(SysUser::getSchoolId,schoolId)
-                .eq(SysUser::getRealName,teacherName));
-        SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().lambda().eq(SysRole::getType,RoleTypeEnum.TEACHER));
+                .eq(SysUser::getSchoolId, schoolId)
+                .eq(SysUser::getRealName, teacherName));
+        SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().lambda().eq(SysRole::getType, RoleTypeEnum.TEACHER));
 //        tbSchoolTeacherList = tbSchoolTeacherList.stream().filter(e -> Arrays.asList(e.getRoleIds()).contains(sysRole.getId())).collect(Collectors.toList());
-        if (tbSchoolTeacherList.size() != 1){
+        if (tbSchoolTeacherList.size() != 1) {
             throw ExceptionResultEnum.ERROR.exception("教师基础数据信息异常");
         }
         return tbSchoolTeacherList.get(0);
@@ -264,7 +264,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         boolean isSuccess = true;
         try {
             Long schoolId = Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild()) ? Long.valueOf(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString()) : null;
-            if (schoolId == null){
+            if (schoolId == null) {
                 schoolId = userSaveParams.getSchoolId();
             }
             SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
@@ -272,19 +272,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             userSaveParams.setSchoolId(schoolId);
             SysUser sysUser = gson.fromJson(gson.toJson(userSaveParams), SysUser.class);
             if (Objects.isNull(sysUser.getId())) {//新增用户
-                // 登录名是否唯一
-                QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-                if (Objects.isNull(schoolId)) {
-                    queryWrapper.lambda().isNull(SysUser::getSchoolId);
-                } else {
-                    queryWrapper.lambda().eq(SysUser::getSchoolId, schoolId);
-                }
-                queryWrapper.lambda().eq(SysUser::getLoginName, sysUser.getLoginName());
-                SysUser user = sysUserService.getOne(queryWrapper);
-                if (user != null) {
-                    throw ExceptionResultEnum.ERROR.exception("用户名已存在");
-                }
-
                 sysUser.setInsertInfo(requestUser.getId());
                 sysUserService.save(sysUser);
                 for (Long roleId : userSaveParams.getRoleIds()) {
@@ -315,7 +302,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     commonService.removeUserInfo(sysUser.getId());
                 }
                 //如果修改了机构或手机号，需更新用户缓存
-                if (Objects.nonNull(dbUser.getOrgId())){
+                if (Objects.nonNull(dbUser.getOrgId())) {
                     if (containsQuestionTeacher || dbUser.getOrgId().longValue() != sysUser.getOrgId().longValue()
                             || !Objects.equals(dbUser.getMobileNumber(), sysUser.getMobileNumber())) {
                         cacheService.updateUserCache(sysUser.getId());
@@ -323,19 +310,19 @@ 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);
-            }
+//            //用户科目全量删除全量增加
+//            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("请求出错", e);
             isSuccess = false;
@@ -355,6 +342,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 临时保存用户不鉴权
+     *
      * @param userSaveParams 用户参数
      * @return 结果
      */
@@ -362,11 +350,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         boolean isSuccess = true;
         try {
             Long schoolId = Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild()) ? Long.valueOf(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString()) : null;
-            if (schoolId == null){
+            if (schoolId == null) {
                 schoolId = userSaveParams.getSchoolId();
             }
-            List<SysUser> requestUserList = this.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId,schoolId).like(SysUser::getLoginName,"admin"));
-            if (requestUserList.size() == 0){
+            List<SysUser> requestUserList = this.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId, schoolId).like(SysUser::getLoginName, "admin"));
+            if (requestUserList.size() == 0) {
                 throw ExceptionResultEnum.ERROR.exception("该学校没有内置的学校管理员");
             }
             SysUser requestUser = requestUserList.get(0);
@@ -417,7 +405,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     commonService.removeUserInfo(sysUser.getId());
                 }
                 //如果修改了机构或手机号，需更新用户缓存
-                if (Objects.nonNull(dbUser.getOrgId())){
+                if (Objects.nonNull(dbUser.getOrgId())) {
                     if (containsQuestionTeacher || dbUser.getOrgId().longValue() != sysUser.getOrgId().longValue()
                             || !Objects.equals(dbUser.getMobileNumber(), sysUser.getMobileNumber())) {
                         cacheService.updateUserCache(sysUser.getId());