From 4776060043b184523de9f36b5700a977c8c5f447 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 21 Apr 2023 10:22:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/user/pojo/vo/UserVO.java |  6 ++++++
 .../com/njcn/user/service/impl/UserServiceImpl.java | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/UserVO.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/UserVO.java
index ea2247a5c..3b76d7695 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/UserVO.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/UserVO.java
@@ -37,6 +37,12 @@ public class UserVO extends UserParam implements Serializable {
     @ApiModelProperty("部门名称")
     private String deptName;
 
+    @ApiModelProperty("区域id")
+    private String areaId;
+
+    @ApiModelProperty("区域名称")
+    private String areaName;
+
     @ApiModelProperty("角色id")
     private List<String> roleList;
 
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
index da0707f5a..0a6e1eda0 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
@@ -23,6 +23,7 @@ import com.njcn.device.pq.api.PqsTerminalLogsClient;
 import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.pojo.bo.BaseLineProExcelBody;
+import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.DictData;
@@ -35,6 +36,7 @@ import com.njcn.user.pojo.constant.UserType;
 import com.njcn.user.pojo.dto.UserDTO;
 import com.njcn.user.pojo.dto.excel.UserExcel;
 import com.njcn.user.pojo.param.UserParam;
+import com.njcn.user.pojo.po.Dept;
 import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.po.UserSet;
 import com.njcn.user.pojo.po.UserStrategy;
@@ -83,6 +85,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     private final PqsTerminalLogsClient pqsTerminalLogsClient;
 
+    private final AreaFeignClient areaFeignClient;
+
     @Override
     public UserDTO getUserByName(String loginName) {
         User user = getUserByLoginName(loginName);
@@ -236,6 +240,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             return null;
         }
         BeanUtil.copyProperties(user, userVO);
+        Dept dept = deptService.getDeptById(user.getDeptId());
+        //非自定义部门
+        if (Objects.equals(dept.getType(),0)){
+            String areaId = deptService.getAreaIdByDeptId(user.getDeptId());
+            userVO.setAreaId(areaId);
+            userVO.setAreaName(areaFeignClient.selectIdArea(areaId).getData().getName());
+        } else {
+            userVO.setAreaName(deptService.getNameByDeptId(user.getDeptId()));
+        }
         userVO.setDeptName(deptService.getNameByDeptId(user.getDeptId()));
         userVO.setRoleList(roleService.getIdByUserId(id));
         userVO.setRole(roleService.getNameByUserId(id));