From d733933fe128f92e7728f66637fd50e4f124d6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Fri, 7 Feb 2025 20:44:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E4=BA=9B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobilebroken/common/pojo/request/UserSearchRequest.java | 6 +++++-
 .../repository/service/impl/AppUserServiceImpl.java         | 6 ++++++
 .../src/main/resources/mapper/AppUserMapper.xml             | 5 ++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/UserSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/UserSearchRequest.java
index 5741b91c..cde52b18 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/UserSearchRequest.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/UserSearchRequest.java
@@ -1,8 +1,11 @@
 package com.nflg.mobilebroken.common.pojo.request;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class UserSearchRequest extends PageRequest{
@@ -14,5 +17,6 @@ public class UserSearchRequest extends PageRequest{
     private Boolean enabled;
 
     //公司id
-    private Integer companyId;
+    @JsonIgnore
+    private List<String> companyIds;
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
index 1669a38d..186c943c 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
@@ -12,6 +12,7 @@ import com.nflg.mobilebroken.common.pojo.request.*;
 import com.nflg.mobilebroken.common.pojo.vo.AppUserForAdminVO;
 import com.nflg.mobilebroken.common.pojo.vo.AppUserVO;
 import com.nflg.mobilebroken.common.util.AdminUserUtil;
+import com.nflg.mobilebroken.common.util.AppUserUtil;
 import com.nflg.mobilebroken.common.util.PageUtil;
 import com.nflg.mobilebroken.common.util.VUtils;
 import com.nflg.mobilebroken.repository.entity.AppArea;
@@ -58,6 +59,9 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
     @Resource
     private ITBaseCustomerService customerService;
 
+    @Resource
+    private IAppUserService appUserService;
+
     @Override
     public AppUser getUser(String userName, String password) {
         AppUser user = lambdaQuery()
@@ -91,6 +95,8 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
 
     @Override
     public IPage<AppUserVO> search(UserSearchRequest request) {
+        AppUser appUser = appUserService.getById(AppUserUtil.getUserId());
+        request.setCompanyIds(Arrays.stream(appUser.getCompanyId().split(",")).filter(StrUtil::isNotBlank).collect(Collectors.toList()));
         return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize()));
     }
 
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
index cb7d7a60..0b4726ad 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
@@ -9,7 +9,10 @@
         INNER JOIN app_area a ON u.area_id=a.id
         LEFT JOIN app_user uc ON u.create_by=uc.id
         LEFT JOIN app_user uu ON u.update_by=uu.id
-        WHERE u.company_id = #{request.companyId}
+        WHERE u.is_primary=false AND u.company_id IN
+        <foreach collection="request.companyIds" item="companyId" open="(" separator="," close=")">
+            #{companyId}
+        </foreach>
         <where>
             <if test="request.enabled != null">
                 AND u.enabled = #{request.enabled}