From e92a6a58f306da0c0baa9002c6768b4e0af3d41f Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 10 Jan 2025 11:23:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wallet/mapper/MchManageMapper.java        | 32 ++++++++++++++++---
 .../service/impl/MchManageServiceImpl.java    |  2 +-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java
index 2fdf13047..191f27239 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java
@@ -1,11 +1,15 @@
 package com.bsd.pjcloud.wallet.mapper;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.BeanUtils;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.wallet.api.dto.MchManageDto;
 import com.bsd.pjcloud.wallet.api.entity.MchManageEntity;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
+import com.bsd.pjcloud.wallet.api.vo.WalletTransactionVo;
 import com.github.yulichang.query.MPJLambdaQueryWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
@@ -25,6 +29,13 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
         return selectJoinPage(page, MchManageVo.class, wrapper);
     }
 
+    default MchManageVo join(Long id) {
+        MPJLambdaQueryWrapper<MchManageEntity> wrapper = new MPJLambdaQueryWrapper<MchManageEntity>()
+                .selectAll(MchManageEntity.class)
+                .eq(MchManageEntity::getId, id);
+        return selectJoinOne(MchManageVo.class, wrapper);
+    }
+
     default List<MchManageVo> list(MchManageDto dto) {
         MPJLambdaQueryWrapper<MchManageEntity> wrapper = new MPJLambdaQueryWrapper<MchManageEntity>()
                 .selectAll(MchManageEntity.class)
@@ -34,10 +45,21 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
         return selectJoinList(MchManageVo.class, wrapper);
     }
 
-    default MchManageVo join(Long id) {
-        MPJLambdaQueryWrapper<MchManageEntity> wrapper = new MPJLambdaQueryWrapper<MchManageEntity>()
-                .selectAll(MchManageEntity.class)
-                .eq(MchManageEntity::getId, id);
-        return selectJoinOne(MchManageVo.class, wrapper);
+    default Page<MchManageVo> scopePageList(Page page, MchManageDto dto) {
+        LambdaQueryWrapper<MchManageEntity> wrapper = new LambdaQueryWrapper<MchManageEntity>()
+                .like(ObjectUtil.isNotEmpty(dto.getName()), MchManageEntity::getName, dto.getName())
+                .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds())
+                .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds());
+        Page list = selectPageByScope(page, wrapper, DataScope.of());
+        list.setRecords(BeanUtils.toBean(list.getRecords(), MchManageVo.class));
+        return list;
+    }
+
+    default List<MchManageEntity> scopeList(MchManageDto dto) {
+        LambdaQueryWrapper<MchManageEntity> wrapper = new LambdaQueryWrapper<MchManageEntity>()
+                .like(ObjectUtil.isNotEmpty(dto.getName()), MchManageEntity::getName, dto.getName())
+                .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds())
+                .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds());
+        return selectListByScope(wrapper, DataScope.of());
     }
 }
\ No newline at end of file
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java
index fd8e34ef5..2da9ab093 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java
@@ -117,7 +117,7 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
 
     @Override
     public Page<MchManageVo> pageJoin(Page page, MchManageDto dto) {
-        Page<MchManageVo> list = baseMapper.pageJoin(page, dto);
+        Page<MchManageVo> list = baseMapper.scopePageList(page, dto);
         if (ObjectUtil.isNotEmpty(list.getRecords())) {
             // 部门
             List<Long> deptIds = list.getRecords().stream().map(MchManageVo::getDeptId).distinct().toList();