From 41819feaa1c6c91e36916b078dcc91889eefbadc Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 18 Jun 2026 09:30:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E9=83=A8=E9=97=A8?=
 =?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/bsd/pjcloud/wallet/api/dto/MchManageDto.java |  7 ++++++-
 .../main/resources/mapper/mch/MchManageMapper.xml    | 12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/MchManageDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/MchManageDto.java
index 65717433e..b12f0b550 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/MchManageDto.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/MchManageDto.java
@@ -1,5 +1,8 @@
 package com.bsd.pjcloud.wallet.api.dto;
 
+import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
+import com.bsd.pjcloud.admin.api.vo.base.BaseIsDeepDeptTreeInterface;
+import com.bsd.pjcloud.admin.api.vo.base.BaseIsIncludeTreeInterface;
 import com.bsd.pjcloud.wallet.api.entity.mch.MchManageEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -12,10 +15,12 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
-public class MchManageDto extends MchManageEntity {
+public class MchManageDto extends MchManageEntity implements BaseIsIncludeTreeInterface {
 
     private List<Long> deptIds;
 
+    private Boolean isInclude;
+
     private List<Long> ids;
 
     private List<Long> notIds;
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml
index d8304eb83..61d63a7a8 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchManageMapper.xml
@@ -99,7 +99,17 @@
             </foreach>
         </if>
         <if test="dto.deptIds != null and dto.deptIds.size() != 0">
-            and a.dept_id in
+            <choose>
+                <when test="dto.isInclude != null and dto.isInclude == true">
+                    and a.dept_id IN
+                </when>
+                <when test="dto.isInclude != null and dto.isInclude == false">
+                    and a.dept_id NOT IN
+                </when>
+                <otherwise>
+                    and a.dept_id IN
+                </otherwise>
+            </choose>
             <foreach collection="dto.deptIds" item="v" open="(" close=")" separator=",">
                 #{v}
             </foreach>