From be22a0a722e42ed9bb84bfe7da1be1f56bdc292c Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 24 Mar 2025 18:01:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/order/HardOrderMapper.xml     |  4 ++--
 .../bsd/pjcloud/wallet/mapper/MchManageMapper.java |  4 ++--
 .../wallet/service/impl/MchManageServiceImpl.java  | 14 ++++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
index aafd662a9..d35aace40 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
@@ -219,9 +219,9 @@
                     #{v}
                 </foreach>
             </if>
-            <if test="dto.setUserDeptIds != null and dto.setUserDeptIds.size() != 0">
+            <if test="dto.getUserDeptIds != null and dto.getUserDeptIds.size() != 0">
                 and a.user_dept_id in
-                <foreach collection="dto.setUserDeptIds" item="v" open="(" close=")" separator=",">
+                <foreach collection="dto.getUserDeptIds" item="v" open="(" close=")" separator=",">
                     #{v}
                 </foreach>
             </if>
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 c7cdae33e..5fc10cbf5 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
@@ -59,8 +59,8 @@ public interface MchManageMapper extends PjcloudBaseMapper<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())
-                .orderByDesc(MchManageEntity::getCreateTime)
-                .orderByDesc(MchManageEntity::getId);
+                .orderByDesc(MchManageEntity::getDeptId)
+                .orderByDesc(MchManageEntity::getCreateTime);
         Page list = selectPageByScope(page, wrapper, DataScope.of());
         list.setRecords(BeanUtils.toBean(list.getRecords(), MchManageVo.class));
         return list;
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 a42b562af..c8c9c6df0 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
@@ -78,10 +78,10 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long create(MchManageEntity dto) {
-        if (existName(dto.getName(), null)) {
+        if (existName(dto.getName(), dto.getTypes(), null)) {
             throw new RuntimeException("商户名不能重复");
         }
-        if (existDeptId(dto.getDeptId(), null)) {
+        if (existDeptId(dto.getDeptId(), dto.getTypes(), null)) {
             throw new RuntimeException("该部门已经绑定过商户");
         }
         baseMapper.insert(dto);
@@ -109,10 +109,10 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
     @Override
     // @CacheEvict(value = CacheConstants.WALLET_MCH, key = "#dto.getId()", condition = "#dto.getId() != null")
     public void edit(MchManageEntity dto) {
-        if (existName(dto.getName(), dto.getId())) {
+        if (existName(dto.getName(), dto.getTypes(), dto.getId())) {
             throw new RuntimeException("商户名不能重复");
         }
-        if (existDeptId(dto.getDeptId(), dto.getId())) {
+        if (existDeptId(dto.getDeptId(), dto.getTypes(), dto.getId())) {
             throw new RuntimeException("该部门已经绑定过商户");
         }
         MchManageEntity mchManage = getSelf().getById(dto.getId());
@@ -266,9 +266,10 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
         }
     }
 
-    private boolean existName(String name, Long id) {
+    private boolean existName(String name, String types, Long id) {
         Long count = baseMapper.selectCount(new LambdaQueryWrapper<MchManageEntity>()
                 .eq(ObjectUtil.isNotEmpty(name), MchManageEntity::getName, name)
+                .eq(ObjectUtil.isNotEmpty(types), MchManageEntity::getTypes, types)
                 .ne(ObjectUtil.isNotEmpty(id), MchManageEntity::getId, id)
         );
         if (ObjectUtil.isNotEmpty(id)) {
@@ -277,9 +278,10 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
         return count > 0;
     }
 
-    private boolean existDeptId(Long deptId, Long id) {
+    private boolean existDeptId(Long deptId, String types, Long id) {
         Long count = baseMapper.selectCount(new LambdaQueryWrapper<MchManageEntity>()
                 .eq(ObjectUtil.isNotEmpty(deptId), MchManageEntity::getDeptId, deptId)
+                .eq(ObjectUtil.isNotEmpty(types), MchManageEntity::getTypes, types)
                 .ne(ObjectUtil.isNotEmpty(id), MchManageEntity::getId, id)
         );
         if (ObjectUtil.isNotEmpty(id)) {