From 7f4ed7cb4881fd3f9091b1d32500616b295c7397 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 9 Jan 2024 22:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.0=E3=80=91=E3=80=90userOrg?=
 =?UTF-8?q?=E3=80=91=E8=8E=B7=E5=8F=96=E4=B8=BB=E9=A1=B5=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=EF=BC=8C=E5=8F=AA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=90=AF=E7=94=A8=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modular/user/service/impl/SysUserOrgServiceImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
index 7fefbfd42..b60336222 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
@@ -7,6 +7,7 @@ import cn.stylefeng.roses.kernel.db.api.DbOperatorApi;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
+import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.sys.api.callback.RemoveOrgCallbackApi;
@@ -164,9 +165,10 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgMapper, SysUser
             return null;
         }
 
-        // 获取用户所有的部门信息
+        // 获取用户所有的部门信息（只查询用户启用的部门）
         LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysUserOrg::getUserId, userId);
+        queryWrapper.eq(SysUserOrg::getStatusFlag, StatusEnum.ENABLE.getCode());
         queryWrapper.orderByDesc(SysUserOrg::getMainFlag);
         List<SysUserOrg> sysUserOrgList = this.list(queryWrapper);