!81 feat(login): selectDepart接口补充部门ID和名称,支持前端反馈表单自动填充
Merge pull request !81 from wsm/feature/feedback_get_dept_info
This commit is contained in:
+11
-1
@@ -319,7 +319,7 @@ public class LoginController {
|
||||
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
|
||||
username = sysUser.getUsername();
|
||||
}
|
||||
|
||||
|
||||
//获取登录部门
|
||||
String orgCode= user.getOrgCode();
|
||||
//获取登录租户
|
||||
@@ -327,6 +327,16 @@ public class LoginController {
|
||||
//设置用户登录部门和登录租户
|
||||
this.sysUserService.updateUserDepart(username, orgCode,tenantId);
|
||||
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();
|
||||
obj.put("userInfo", sysUser);
|
||||
result.setResult(obj);
|
||||
|
||||
Reference in New Issue
Block a user