From 57c6c72dc8ded3b6b8b5ef81228e684d79fde44c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 18:04:46 +0800
Subject: [PATCH] bug修改
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java | 12 ++++++++++++
medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java | 6 ++++--
2 files changed, 16 insertions(+), 2 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());
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java
index 8e98b5c..55b9e9f 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java
@@ -1,7 +1,5 @@
package com.sinata.system.domain.dto;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.sinata.common.annotation.Excel;
import com.sinata.common.core.domain.entity.SysRole;
import com.sinata.system.domain.SysDepartment;
import io.swagger.annotations.ApiModelProperty;
@@ -18,4 +16,8 @@
@ApiModelProperty("单位名称")
private SysDepartment department;
private SysRole role;
+ @ApiModelProperty("当前区域id")
+ private Long currentDepartmentId;
+ @ApiModelProperty("当前区域名称")
+ private String currentDepartmentName;
}
--
Gitblit v1.7.1