diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java
index e29580abb..893674189 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java
@@ -8,7 +8,7 @@ import java.util.List;
 @Data
 public class HardOrderSumAndCountDto {
 
-    private List<Long> deptIds;
+    private List<Long> userDeptIds;
 
     private List<String> orderStatusCodes;
 
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 abff7e215..2c32201af 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
@@ -321,7 +321,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
             // 查询订单支付流水
             CompletableFuture<List<HardOrderSumAndCountVo>> payFuture = CompletableFuture.supplyAsync(() -> {
                 HardOrderSumAndCountDto payDto = new HardOrderSumAndCountDto();
-                payDto.setDeptIds(deptIds);
+                payDto.setUserDeptIds(deptIds);
                 payDto.setOrderStatusCodes(HardOrderStatusEnum.getPayPrice());
                 if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) {
                     payDto.setCreateTimeList(dto.getCreateTimeList());
@@ -334,7 +334,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
             // 查询订单退款流水
             CompletableFuture<List<HardOrderSumAndCountVo>> refundFuture = CompletableFuture.supplyAsync(() -> {
                 HardOrderSumAndCountDto refundDto = new HardOrderSumAndCountDto();
-                refundDto.setDeptIds(deptIds);
+                refundDto.setUserDeptIds(deptIds);
                 refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPayErrorCodes());
                 if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) {
                     refundDto.setCreateTimeList(dto.getCreateTimeList());
@@ -347,7 +347,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
             // 查看盈利流水
             CompletableFuture<List<HardOrderSumAndCountVo>> profitFuture = CompletableFuture.supplyAsync(() -> {
                 HardOrderSumAndCountDto refundDto = new HardOrderSumAndCountDto();
-                refundDto.setDeptIds(deptIds);
+                refundDto.setUserDeptIds(deptIds);
                 refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
                 if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) {
                     refundDto.setCreateTimeList(dto.getCreateTimeList());
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 951949bd5..aafd662a9 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
@@ -6,6 +6,7 @@
         <id property="id" column="id"/>
         <result property="orderNo" column="order_no"/>
         <result property="userId" column="user_id"/>
+        <result property="userDeptId" column="user_dept_id"/>
         <result property="merchantId" column="merchant_id"/>
         <result property="hardId" column="hard_id"/>
         <result property="deptId" column="dept_id"/>
@@ -42,6 +43,7 @@
         select a.id,
                a.order_no,
                a.user_id,
+               a.user_dept_id,
                a.merchant_id,
                a.hard_id,
                a.dept_id,
@@ -217,9 +219,9 @@
                     #{v}
                 </foreach>
             </if>
-            <if test="dto.deptIds != null and dto.deptIds.size() != 0">
-                and a.dept_id in
-                <foreach collection="dto.deptIds" item="v" open="(" close=")" separator=",">
+            <if test="dto.setUserDeptIds != null and dto.setUserDeptIds.size() != 0">
+                and a.user_dept_id in
+                <foreach collection="dto.setUserDeptIds" item="v" open="(" close=")" separator=",">
                     #{v}
                 </foreach>
             </if>
diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java
index a7b225a54..f5ab38542 100644
--- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java
+++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java
@@ -5,7 +5,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class DeptAllListDto  {
+public class DeptAllListDto {
 
     private Long deptId;
 
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java
index e4b837ea3..a99570c9a 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java
@@ -21,6 +21,8 @@ public class WalletTransactionSumAndCountDto {
 
     private List<Long> deptIds;
 
+    private List<Long> userDeptIds;
+
     private List<String> bizTypes;
 
     private LocalDateTime[] createTimeList;