From 23cda60b5d11f28c387486c2b72209e2074528ef Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Tue, 14 Jul 2026 10:56:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(login):=20selectDepart=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=83=A8=E9=97=A8ID=E5=92=8C=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E6=94=AF=E6=8C=81=E5=89=8D=E7=AB=AF=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E8=A1=A8=E5=8D=95=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../modules/system/controller/LoginController.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java index 9af4140..c37d128 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java @@ -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);