From 92bb8571745844c6c918f0944ad34e57d05dcfb3 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Mon, 17 Apr 2023 17:32:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8C=BA=E5=9F=9F=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java | 2 ++
 .../main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java
index cc293b3..7a2d392 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java
@@ -416,6 +416,8 @@ public class UserInfoManage {
             resUserDetailVO.setOrgCode(userFullInfo.getOrganizationCode());
             resUserDetailVO.setOrgName(userFullInfo.getOrganizationName());
             resUserDetailVO.setRegionCode(userFullInfo.getRegionCode());
+            resUserDetailVO.setRegionName(regionCacheHelper.getRegionName(userFullInfo.getRegionCode()
+                    ,RegionConst.RL_COUNTY));
             resUserDetailVO.setEmpPosUnitCode(userFullInfo.getEmpPosUnitCode());
             resUserDetailVO.setEmpPosUnitName(userFullInfo.getEmpPosUnitName());
         }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java
index ba3766a..f5b50e8 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserDetailVO.java
@@ -4,9 +4,11 @@ import com.ningdatech.pmapi.common.constant.RegionConst;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author liuxinxin
@@ -40,6 +42,7 @@ public class ResUserDetailVO {
     @ApiModelProperty("所属区域")
     private Long regionId;
     private String regionCode;
+    private String regionName;
 
     @ApiModelProperty("用户任职所在单位code")
     private String empPosUnitCode;