From ca05bbf00a450774fb8509497b40f6db381f45b0 Mon Sep 17 00:00:00 2001 From: liu Date: Fri, 28 Jun 2024 13:49:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A2=9E=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../knowsub/service/impl/UserManageServiceImpl.java | 7 +++++++ .../java/com/supervision/knowsub/vo/user/LoginResVO.java | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java index 779028a..21931eb 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/UserManageServiceImpl.java @@ -12,8 +12,10 @@ import com.supervision.knowsub.domain.UserInfo; import com.supervision.knowsub.dto.role.UserRoleDTO; import com.supervision.knowsub.dto.user.UserPageQuery; import com.supervision.knowsub.exception.BusinessException; +import com.supervision.knowsub.model.SystemDept; import com.supervision.knowsub.model.SystemRole; import com.supervision.knowsub.model.SystemUser; +import com.supervision.knowsub.service.SystemDeptService; import com.supervision.knowsub.service.SystemRoleService; import com.supervision.knowsub.service.UserManageService; import com.supervision.knowsub.service.UserRoleRelationManageService; @@ -48,6 +50,8 @@ public class UserManageServiceImpl implements UserManageService { private final SystemRoleService systemRoleService; + private final SystemDeptService systemDeptService; + @Override @Transactional(rollbackFor = Exception.class) public LoginResVO login(LoginReqVO reqVO) { @@ -66,6 +70,9 @@ public class UserManageServiceImpl implements UserManageService { loginResVO.setUsername(user.get().getUsername()); List userRoleDTOS = userRoleRelationManageService.listUserRole(user.get().getId(),null); loginResVO.setUserRoleDTOList(userRoleDTOS); + // 获取用户的部门 + Optional optById = systemDeptService.getOptById(user.get().getDeptId()); + loginResVO.setDeptName(optById.isPresent() ? optById.get().getDeptName() : "未知部门"); return loginResVO; } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/vo/user/LoginResVO.java b/know_sub_model/src/main/java/com/supervision/knowsub/vo/user/LoginResVO.java index 8b6e114..88a52a9 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/vo/user/LoginResVO.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/vo/user/LoginResVO.java @@ -25,6 +25,10 @@ public class LoginResVO { @Schema(description = "token") private String token; + @Schema(description = "所属部门ID") + private String deptId; + @Schema(description = "所属部门名称") + private String deptName; private static final long serialVersionUID = 1L; }