From b4342154b6b2360fc220d6cf2c61f534f8e6bb3b Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 19 Jan 2026 10:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BC=81=E4=B8=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zcloud/basic/info/dto/UserPageQry.java  |  7 +++++++
 .../repository/impl/UserRepositoryImpl.java     | 17 ++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java
index b98dd8d6..de65d7a0 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java
@@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * web-client
@@ -53,5 +55,10 @@ public class UserPageQry extends PageQuery {
     private String menuPath;
 
     private Integer noMain;
+    @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "inType")
+    private List<Integer> inType;
+
+    @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType")
+    private Integer enterpriseType;
 }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
index e2a2d430..139b76ec 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
@@ -24,6 +24,7 @@ import com.jjb.saas.system.client.role.response.RoleCO;
 import com.jjb.saas.system.client.user.facade.UserFacade;
 import com.jjb.saas.system.client.user.request.*;
 import com.jjb.saas.system.client.user.response.UserDetailCO;
+import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.domain.enums.MenuEnum;
 import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
 import com.zcloud.basic.info.domain.enums.UserTypeEnum;
@@ -130,14 +131,28 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
                 params.remove("inDepartmentId");
             }
         }
-        IPage<UserDO> iPage = new Query<UserDO>().getPage(params);
         QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>();
+        List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
+        if (CollUtil.isNotEmpty(enterpriseType)) {
+            params.remove("enterpriseType");
+            queryWrapper.in("c.type", enterpriseType);
+            queryWrapper.eq("c.use_flag", 1);
+        }
+        List<Integer> inType = (List<Integer>) params.get("inType");
+        if (CollUtil.isNotEmpty(inType)) {
+            queryWrapper.in("c.type", inType);
+            queryWrapper.eq("c.use_flag", 1);
+        }
+        params.remove("inType");
+        IPage<UserDO> iPage = new Query<UserDO>().getPage(params);
+
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params, "u.");
         queryWrapper.eq("u.delete_enum", "FALSE");
         if (!ObjectUtils.isEmpty(params.get("noMain"))) {
             queryWrapper.apply("u.id != u.corpinfo_id");
         }
 
+
         queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time");
         IPage<UserDO> result = userMapper.pageByNopermission(iPage, queryWrapper);
         return PageHelper.pageToResponse(result, result.getRecords());