From b8207853d58b3d2c38518289b70a47c68c037773 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Thu, 29 Aug 2024 11:39:36 +0800
Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E5=A2=9E=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=AF=E5=8C=BA=E5=8E=BF=E7=94=A8=E6=88=B7=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hz/pm/api/common/model/constant/MhUnitConst.java     | 2 ++
 .../src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java   | 8 +++++---
 .../main/java/com/hz/pm/api/user/model/vo/ResUserDetailVO.java    | 3 +++
 .../java/com/hz/pm/api/user/security/model/UserInfoDetails.java   | 5 +++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/MhUnitConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/MhUnitConst.java
index c6ff5c6..7222c3b 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/MhUnitConst.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/MhUnitConst.java
@@ -16,6 +16,8 @@ public class MhUnitConst {
     private MhUnitConst() {
     }
 
+    public static final long COUNTY_PARENT_UNIT_ID = 1084;
+
     public static final long ROOT_UNIT_ID = 1;
 
     public static final String UNIT_XCB = "信创办";
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java
index ade128d..fea19e2 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/UserInfoManage.java
@@ -26,6 +26,7 @@ import com.hz.pm.api.user.model.vo.ResUserDetailVO;
 import com.hz.pm.api.user.model.vo.UserInfoListVO;
 import com.hz.pm.api.user.model.vo.UserRoleVO;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
+import com.hz.pm.api.user.security.model.UserInfoDetails;
 import com.hz.pm.api.user.service.IUserInfoService;
 import com.hz.pm.api.user.util.LoginUserUtil;
 import com.ningdatech.basic.exception.BizException;
@@ -267,8 +268,8 @@ public class UserInfoManage {
 
 
     public ResUserDetailVO currentUserInfo() {
-        Long userId = LoginUserUtil.getUserId();
-        UserInfo userInfo = userInfoService.getById(userId);
+        UserInfoDetails userDetail = LoginUserUtil.loginUserDetail();
+        UserInfo userInfo = userInfoService.getById(userDetail.getUserId());
         if (Objects.isNull(userInfo)) {
             return null;
         }
@@ -286,7 +287,7 @@ public class UserInfoManage {
         resUserDetail.setMhUnitName(userInfo.getMhUnitName());
 
         // 装配用户角色信息列表
-        List<UserRole> userRoleList = userRoleService.listByUserId(userId);
+        List<UserRole> userRoleList = userRoleService.listByUserId(userDetail.getUserId());
         if (CollUtil.isNotEmpty(userRoleList)) {
             List<Long> roleIdList = CollUtils.fieldList(userRoleList, UserRole::getRoleId);
             List<Role> roleList = roleService.listByIds(roleIdList);
@@ -299,6 +300,7 @@ public class UserInfoManage {
             }).collect(Collectors.toList());
             resUserDetail.setUserRoleInfoList(userRoles);
         }
+        resUserDetail.setIsCountyUser(userDetail.isCountyUser());
         return resUserDetail;
     }
 
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/user/model/vo/ResUserDetailVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/user/model/vo/ResUserDetailVO.java
index 0b72723..4f80066 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/user/model/vo/ResUserDetailVO.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/user/model/vo/ResUserDetailVO.java
@@ -51,4 +51,7 @@ public class ResUserDetailVO {
     @ApiModelProperty("头像")
     private String avatar;
 
+    @ApiModelProperty("是否是区县用户")
+    private Boolean isCountyUser;
+
 }
diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/user/security/model/UserInfoDetails.java b/hz-pm-api/src/main/java/com/hz/pm/api/user/security/model/UserInfoDetails.java
index 1e5f722..49bbf6e 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/user/security/model/UserInfoDetails.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/user/security/model/UserInfoDetails.java
@@ -2,6 +2,7 @@ package com.hz.pm.api.user.security.model;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.hz.pm.api.common.model.constant.MhUnitConst;
 import com.hz.pm.api.sys.model.entity.Role;
 import com.hz.pm.api.user.model.enumeration.RoleEnum;
 import com.ningdatech.basic.auth.AbstractLoginUser;
@@ -162,4 +163,8 @@ public class UserInfoDetails extends AbstractLoginUser implements UserDetails {
         return Collections.emptyList();
     }
 
+    public boolean isCountyUser() {
+        return getMhUnitId().equals(MhUnitConst.COUNTY_PARENT_UNIT_ID);
+    }
+
 }