Merge remote-tracking branch 'origin/master'

This commit is contained in:
ye1023
2026-07-14 14:29:50 +08:00
@@ -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);