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 29e237baf..5f52aa020 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
@@ -136,12 +136,13 @@ public class HardOrderController {
         dto.setIsFindCarList(false);
         PjcloudUser user = SecurityUtils.getUser();
         // 判断是否为合作超市管理员工
-        if (!hardManagerService.isSuperMarketAdmin(user)) {
-            return R.ok(new Page());
-        }
+        if (!hardManagerService.isSuperMarketAdmin(user)) return R.ok(new Page());
+        // 查询用户属于的商户
+        MchManageVo mch = mchService.getFirstMchByDeptId(user.getDeptId()).getData();
+        if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
         // 查询商户和下面的子商户
-        List<Long> mchDtoIds = dto.getMchIds();
-        if (ObjectUtil.isNotEmpty(mchDtoIds) && mchDtoIds.size() == 1) {
+        List<Long> mchDtoIds = List.of(mch.getId());
+        if (ObjectUtil.isNotEmpty(mchDtoIds)) {
             Long mchId = mchDtoIds.get(0);
             List<MchManageVo> mchList = mchService.getByParentId(mchId).getData();
             if (ObjectUtil.isNotEmpty(mchList)) {
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java
index 52d9cd05b..6127fb4bb 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java
@@ -68,12 +68,13 @@ public class HardOrderTotalController {
         PjcloudUser user = SecurityUtils.getUser();
         dto.setIsFindCarList(false);
         // 判断是否为合作超市管理员工
-        if (!hardManagerService.isSuperMarketAdmin(user)) {
-            return R.ok(new Page());
-        }
+        if (!hardManagerService.isSuperMarketAdmin(user)) return R.ok(new Page());
+        // 查询用户属于的商户
+        MchManageVo mch = mchService.getFirstMchByDeptId(user.getDeptId()).getData();
+        if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
+        List<Long> mchDtoIds = List.of(mch.getId());
         // 查询商户和下面的子商户
-        List<Long> mchDtoIds = dto.getMchIds();
-        if (ObjectUtil.isNotEmpty(mchDtoIds) && mchDtoIds.size() == 1) {
+        if (ObjectUtil.isNotEmpty(mchDtoIds)) {
             Long mchId = mchDtoIds.get(0);
             List<MchManageVo> mchList = mchService.getByParentId(mchId).getData();
             if (ObjectUtil.isNotEmpty(mchList)) {
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 8c12e034d..972adf779 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
@@ -124,10 +124,6 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
      */
     @Override
     public Page<HardOrderVo> appMchPageJoin(Page page, HardOrderDto dto, PjcloudUser user) {
-        // 查询用户属于的商户
-        MchManageVo mch = remoteMchService.getFirstMchByDeptId(user.getDeptId()).getData();
-        if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
-        dto.setMerchantId(mch.getId());
         return getSelf().pagejoin(page, dto);
     }
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
index ee455f8b7..44b496d63 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
@@ -182,10 +182,6 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
 
     @Override
     public List<HardOrderCsVo> listCsByDay(Page page, HardOrderDto dto, PjcloudUser user) {
-        // 查询用户属于的商户
-        MchManageVo mch = remoteMchService.getFirstMchByDeptId(user.getDeptId()).getData();
-        if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
-        dto.setMerchantId(mch.getId());
         // 查询总流水
         CompletableFuture<List<HardOrderCsVo>> totalListFuture = CompletableFuture.supplyAsync(() -> {
             HardOrderDto totalDto = BeanUtil.toBean(dto, HardOrderDto.class);