From b0f18ce58aeafc06190350700f4f5a0ff4bbb796 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Tue, 18 Mar 2025 18:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/system/SysLoginController.java | 35 +++++++++++++------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index ebb67bd..8c3d8b9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -79,7 +79,7 @@ public class SysLoginController {
@RequestParam(required = false) String TOKEN) {
//todo user表中的deptId等于classId
-
+ //todo 老师班级ID为空，不返回deptid
if (StringUtils.isBlank(TOKEN)) {
String username = loginBody.getUsername();
SysUser sysUser = sysUserMapper.selectUserByStudentNumber(username);
@@ -91,12 +91,17 @@ public class SysLoginController {
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
SysUser user = sysUserMapper.selectDeptIdByStudentNumber(loginBody.getUsername());
+ //班级名称为空， 是老师账号
+ if (sysUser.getStuClass() != null) {
+ ajax.put("deptId", sysUser.getDeptId()); //班级ID
+ SysDept sysDept = sysDeptMapper.selectDeptById(sysUser.getDeptId());
+ Long parentId = sysDept.getParentId();
+ ajax.put("schoolId", parentId.toString()); //学校ID
+ } else {
+ ajax.put("schoolId", sysUser.getDeptId()); //老师账号的deptId就是存的学校ID
+ }
ajax.put(Constants.TOKEN, token);
- ajax.put("deptId", user.getDeptId());
ajax.put("UserId", user.getUserId());
- SysDept sysDept = sysDeptMapper.selectDeptById(sysUser.getDeptId());
- Long parentId = sysDept.getParentId();
- ajax.put("schoolId", parentId.toString()); //学校ID
return ajax;
}
return new AjaxResult(403, "用户权限不正确");
@@ -127,12 +132,19 @@ public class SysLoginController {
String tokenWbdsj = loginService.login(sysUser.getUserName(), "123456", "1",
String.valueOf(UUID.randomUUID()));
ajax.put(Constants.TOKEN, tokenWbdsj);
- ajax.put("deptId", sysUser.getDeptId()); //班级ID
+
+ //班级名称为空， 是老师账号
+ if (sysUser.getStuClass() != null) {
+ ajax.put("deptId", sysUser.getDeptId()); //班级ID
+ SysDept sysDept = sysDeptMapper.selectDeptById(sysUser.getDeptId());
+ Long parentId = sysDept.getParentId();
+ ajax.put("schoolId", parentId.toString()); //学校ID
+ } else {
+ ajax.put("schoolId", sysUser.getDeptId()); //老师账号的deptId就是存的学校ID
+ }
ajax.put("UserId", sysUser.getUserId());
- SysDept sysDept = sysDeptMapper.selectDeptById(sysUser.getDeptId());
- Long parentId = sysDept.getParentId();
- ajax.put("schoolId", parentId.toString()); //学校ID
+
return ajax;
}
}
@@ -203,6 +215,10 @@ public class SysLoginController {
if (userInfo != null) {
continue;
}
+ Long rolId = sysUserRoleMapper.selectRoleIdByUserId(userId);
+ if (rolId!=null){
+ continue;
+ }
//填充用户信息
SysUser stuUser = new SysUser();
stuUser.setUserId(userId); //使用智云的
@@ -236,7 +252,6 @@ public class SysLoginController {
if (roleId == 4) {
sysUserRole.setRoleId(2L);
}
- userRoleList.add(sysUserRole);
//填充学校和班级信息
SysDept sysDept = sysDeptMapper.selectDeptById(Long.valueOf(zyUserInfo.getSchoolId())); //判断学校是否存在