From bd44b05849f2a8c43135f48a1308ace7cca8bd82 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 11 May 2023 15:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90user=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/impl/SysUserOrgServiceServiceImpl.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
index bd9790722..8853b5ad8 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
@@ -204,7 +204,12 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
 
     @Override
     public SysUserOrg detail(UserOrgRequest userOrgResponse) {
-        return this.getOne(this.createWrapper(userOrgResponse), false);
+        LambdaQueryWrapper<SysUserOrg> wrapper = this.createWrapper(userOrgResponse);
+
+        // 只查询一个主公司
+        wrapper.eq(SysUserOrg::getMainFlag, YesOrNotEnum.Y.getKey());
+
+        return this.getOne(wrapper, false);
     }
 
     @Override
@@ -287,7 +292,6 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
         queryWrapper.eq(ObjectUtil.isNotEmpty(userOrgResponse.getUserId()), SysUserOrg::getUserId, userOrgResponse.getUserId());
         queryWrapper.eq(ObjectUtil.isNotEmpty(userOrgResponse.getOrgId()), SysUserOrg::getOrgId, userOrgResponse.getOrgId());
         queryWrapper.eq(ObjectUtil.isNotEmpty(userOrgResponse.getPositionId()), SysUserOrg::getPositionId, userOrgResponse.getPositionId());
-        queryWrapper.eq(SysUserOrg::getMainFlag, YesOrNotEnum.Y.getKey());
         return queryWrapper;
     }