sz-team/supervision-test-repo
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ye1023
2026-07-14 14:29:50 +08:00
parent ca3acf2d6f 83871179ef
commit 17ef0fb722
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
+11 -1
View File
@@ -319,7 +319,7 @@ public class LoginController {
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
username = sysUser.getUsername(); username = sysUser.getUsername();
} }
//获取登录部门 //获取登录部门
String orgCode= user.getOrgCode(); String orgCode= user.getOrgCode();
//获取登录租户 //获取登录租户
@@ -327,6 +327,16 @@ public class LoginController {
//设置用户登录部门和登录租户 //设置用户登录部门和登录租户
this.sysUserService.updateUserDepart(username, orgCode,tenantId); this.sysUserService.updateUserDepart(username, orgCode,tenantId);
SysUser sysUser = sysUserService.getUserByName(username); SysUser sysUser = sysUserService.getUserByName(username);
// 查询部门信息并设置到 userInfo 中，前端反馈表单等处需要用到部门ID和名称
if (oConvertUtils.isNotEmpty(orgCode)) {
SysDepart depart = sysDepartService.lambdaQuery()
.eq(SysDepart::getOrgCode, orgCode)
.one();
if (depart != null) {
sysUser.setOrgCodeTxt(depart.getDepartName());
sysUser.setDepartIds(depart.getId());
}
}
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("userInfo", sysUser); obj.put("userInfo", sysUser);
result.setResult(obj); result.setResult(obj);