用户修改、导入 更改机构直接踢出系统

班级查询方法bug

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

@@ -197,10 +197,15 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
     @Override
     public List<ClazzDatasourceResult> findClazzDatasource(Long campusId) {
         Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
-        return this.list(new QueryWrapper<BasicClazz>().lambda()
-                .eq(BasicClazz::getEnable, true)
-                .eq(BasicClazz::getCampusId, campusId)
-                .eq(BasicClazz::getSchoolId, schoolId)).stream()
+        QueryWrapper<BasicClazz> basicClazzQueryWrapper = new QueryWrapper<>();
+
+        basicClazzQueryWrapper.lambda().eq(BasicClazz::getEnable, true)
+                .eq(BasicClazz::getSchoolId, schoolId);
+        if (SystemConstant.longNotNull(campusId)) {
+            basicClazzQueryWrapper.lambda().eq(BasicClazz::getCampusId, campusId);
+        }
+
+        return this.list(basicClazzQueryWrapper).stream()
                 .map(e -> {
                     ClazzDatasourceResult clazzDatasourceResult = new ClazzDatasourceResult();
                     clazzDatasourceResult.setId(e.getId());

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

@@ -338,6 +338,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     commonCacheService.removeUserRolePrivilegeCache(sysUser.getId());
                     commonService.addUserRolePrivilege(sysUser, userSaveParams.getRoleIds());
                     commonService.removeUserInfo(sysUser.getId(), true);
+                }else if (!dbUser.getOrgId().equals(sysUser.getOrgId())){
+                    commonService.removeUserInfo(sysUser.getId(), true);
                 }
                 //如果修改了机构或手机号，需更新用户缓存
                 if (Objects.nonNull(dbUser.getOrgId())) {
@@ -709,6 +711,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     List<SysUserRole> sysUserRoleCell = commonService.disposeUserPrivilege(userCell, userSaveParams.getRoleIds());
                     sysUserRoleList.addAll(sysUserRoleCell);
                     willRemoveUserPri.add(userCell.getId());
+                }else if (!dbUser.getOrgId().equals(userCell.getOrgId())){
+                    commonService.removeUserInfo(userCell.getId(), true);
                 }
                 //如果修改了机构或手机号，需更新用户缓存
                 if (Objects.nonNull(dbUser.getOrgId())) {