From b5397833afb03b9278c38e618c20703a71de7e65 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 17 Jun 2023 12:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90portal=E3=80=91=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HrOrganizationServiceImpl.java           | 6 ++++++
 .../position/service/impl/HrPositionServiceImpl.java      | 5 +++++
 .../modular/user/service/impl/SysUserServiceImpl.java     | 8 +++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
index a0d3dcfe5..71256e7d2 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
@@ -692,6 +692,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
 
         LambdaQueryWrapper<HrOrganization> queryWrapper = this.createWrapper(hrOrganizationRequest);
 
+        // parentId不是null的
+        queryWrapper.isNotNull(HrOrganization::getOrgParentId);
+
+        // 查询启用的状态
+        queryWrapper.eq(HrOrganization::getStatusFlag, StatusEnum.ENABLE.getCode());
+
         // 数据范围过滤
         // 如果是超级管理员，或者数据范围权限是所有，则不过滤数据范围
         boolean needToDataScope = true;
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java
index cf982d7b1..759da02a6 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java
@@ -153,6 +153,11 @@ public class HrPositionServiceImpl extends ServiceImpl<HrPositionMapper, HrPosit
         sysUserLambdaQueryWrapper.eq(SysUser::getUserId, userId);
         sysUserLambdaQueryWrapper.select(BaseExpandFieldEntity::getExpandField);
         SysUser currentUser = this.sysUserService.getOne(sysUserLambdaQueryWrapper, false);
+
+        if (currentUser == null) {
+            return;
+        }
+
         Map<String, Object> expandField = currentUser.getExpandField();
 
         if (ObjectUtil.isEmpty(expandField)) {
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
index b948a055e..634586f83 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
@@ -900,9 +900,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
 
         // 获取用户的头像地址
-        String fileAuthUrl = fileInfoApi.getFileAuthUrl(detail.getAvatar());
-        if (fileAuthUrl != null) {
-            detail.setAvatarUrl(fileAuthUrl);
+        if(detail.getAvatar() != null){
+            String fileAuthUrl = fileInfoApi.getFileAuthUrl(detail.getAvatar());
+            if (fileAuthUrl != null) {
+                detail.setAvatarUrl(fileAuthUrl);
+            }
         }
 
         sysUserCacheOperatorApi.put(String.valueOf(userId), detail);