From cee050edb9c88506f8082489d6b97524380e8592 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 27 Mar 2025 09:45:51 +0800
Subject: [PATCH] 11

---
 .../hard/controller/order/HardOrderController.java        | 8 +++-----
 .../bsd/pjcloud/hard/mapper/order/HardOrderMapper.java    | 2 +-
 .../com/bsd/pjcloud/hard/service/HardOrderService.java    | 2 +-
 .../hard/service/impl/order/HardOrderServiceImpl.java     | 4 ++--
 .../src/main/resources/mapper/order/HardOrderMapper.xml   | 3 ++-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
index 583c15fd8..e6b9bddbd 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
@@ -157,14 +157,12 @@ public class HardOrderController {
     @GetMapping("/page-join")
     @PreAuthorize("@pms.hasPermission('hard_hardwareOrder_view')")
     public R pageJoin(@ParameterObject Page page, @ParameterObject HardOrderDto dto) {
+        DataScope dataScope = DataScope.of();
+        dataScope.setScopeDeptName("hardTypeDeptId");
         PjcloudUser user = SecurityUtils.getUser();
         CurrentUserHardTypeInfoDto hardTypeInfo = hardManagerService.getCurrentUserHardTypeInfo(user);
         dto.setMchTypeCodes(hardTypeInfo.getHardTypeList());
-        MchManageVo data = mchService.getByDeptId(user.getDeptId(), MerchantTypeEnum.SELF_SUPERMARKET).getData();
-        if (ObjectUtil.isNotEmpty(data)) {
-            dto.setMerchantId(data.getId());
-        }
-        return R.ok(hardwareOrderService.scopePageList(page, dto));
+        return R.ok(hardwareOrderService.scopePageList(page, dto, dataScope));
     }
 
     @Operation(summary = "通过id查询", description = "通过id查询")
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java
index c70c7550a..4bba10015 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java
@@ -84,7 +84,7 @@ public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {
         return selectListByScope(commonWrapper(dto), DataScope.of());
     }
 
-    Page<HardOrderVo> scopePageList(Page page, @Param("dto") HardOrderDto dto);
+    Page<HardOrderVo> scopePageList(Page page, @Param("dto") HardOrderDto dto, DataScope dataScope);
 
     List<HardOrderSbVo> listSb(@Param("dto") HardOrderDto dto, DataScope dataScope);
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java
index 601ecb94f..ea46186b9 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java
@@ -24,7 +24,7 @@ public interface HardOrderService extends IService<HardOrderEntity> {
      */
     Page<HardOrderVo> appMchPageJoin(Page page, HardOrderDto dto, PjcloudUser user);
 
-    Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto);
+    Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto, DataScope dataScope);
 
     List<HardOrderVo> scopeList(HardOrderDto dto);
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
index 6f8875ae7..ee045c4bb 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
@@ -132,8 +132,8 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
     }
 
     @Override
-    public Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto) {
-        Page<HardOrderVo> list = baseMapper.scopePageList(page, dto);
+    public Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto, DataScope dataScope) {
+        Page<HardOrderVo> list = baseMapper.scopePageList(page, dto, dataScope);
         if (ObjectUtil.isNotEmpty(list.getRecords())) {
             // 用户
             List<Long> userIds = list.getRecords().stream().map(HardOrderVo::getUserId).filter(ObjectUtil::isNotEmpty).distinct().toList();
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 fb908f633..af9d54051 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
@@ -168,7 +168,8 @@
     <select id="scopePageList" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderVo">
         <include refid="selectA"/>
         m.name as hardName,
-        m.type as hardType
+        m.type as hardType,
+        m.dept_id as hardTypeDeptId
         from hard_order a
         left join hard_manager m on m.id = a.hard_id
         <where>