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);