From 2d98f8b5b6f72e4b274fd292c21e5bd49980a8c8 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期一, 07 四月 2025 09:46:17 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
index e38fe84..8c82857 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
@@ -21,6 +21,7 @@
import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.SysUserRole;
import com.sinata.system.domain.dto.UserInfoDTO;
+import com.sinata.system.enums.DepartmentEnum;
import com.sinata.system.mapper.SysUserRoleMapper;
import com.sinata.system.service.ISysMenuService;
import com.sinata.system.service.ISysRoleService;
@@ -41,6 +42,7 @@
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Random;
import java.util.Set;
@@ -230,6 +232,16 @@
userInfoDTO.setNickName(user.getNickName());
userInfoDTO.setDepartment(byId2);
userInfoDTO.setRoles(roles);
+ if (byId2.getOrgType().equals(DepartmentEnum.REGULATORY_UNIT.getCode())) {
+ SysDepartment department = departmentService.getById(byId2.getParentId());
+ if (Objects.nonNull(department)) {
+ userInfoDTO.setCurrentDepartmentId(department.getId());
+ userInfoDTO.setCurrentDepartmentName(department.getDepartmentName());
+ }
+ } else {
+ userInfoDTO.setCurrentDepartmentId(byId2.getId());
+ userInfoDTO.setCurrentDepartmentName(byId2.getDepartmentName());
+ }
SysUserRole sysUserRole = sysUserRoleMapper.selectOne(Wrappers.<SysUserRole>lambdaQuery().eq(SysUserRole::getUserId, user.getUserId()));
if (sysUserRole != null) {
SysRole byId = roleService.getById(sysUserRole.getRoleId());
--
Gitblit v1.7.1