From 551b41413fdb3cfab1015de293e1813ddaafafa4 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 4 Jul 2023 17:13:55 +0800
Subject: [PATCH] update

---
 .../pile/OrderBasicInfoController.java        | 20 +++++++++++++++++++
 .../impl/OrderBasicInfoServiceImpl.java       | 11 +---------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
index c1722e4e3..b9db828b0 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
@@ -1,15 +1,20 @@
 package com.jsowell.web.controller.pile;
 
+import com.google.common.collect.Lists;
 import com.jsowell.common.annotation.Log;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
 import com.jsowell.common.core.page.TableDataInfo;
 import com.jsowell.common.enums.BusinessType;
+import com.jsowell.common.util.SecurityUtils;
 import com.jsowell.common.util.poi.ExcelUtil;
 import com.jsowell.pile.domain.OrderBasicInfo;
+import com.jsowell.pile.domain.PileMerchantInfo;
 import com.jsowell.pile.dto.ManualSettlementDTO;
 import com.jsowell.pile.dto.QueryOrderDTO;
 import com.jsowell.pile.service.IOrderBasicInfoService;
+import com.jsowell.pile.service.IPileMerchantInfoService;
 import com.jsowell.pile.vo.web.OrderListVO;
 import com.jsowell.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,12 +46,27 @@ public class OrderBasicInfoController extends BaseController {
 	@Autowired
 	private OrderService orderService;
 
+	@Autowired
+	private IPileMerchantInfoService pileMerchantInfoService;
+
 	/**
 	 * 查询订单列表
 	 */
 	@PreAuthorize("@ss.hasPermi('order:order:list')")
 	@GetMapping("/order/list")
 	public TableDataInfo list(QueryOrderDTO dto) {
+		// 权限过滤
+		AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
+		if (authorizedMap == null) {
+			// 为空表示没有权限，返回空数组
+			return new TableDataInfo();
+		}
+		String deptId = authorizedMap.getDeptId();
+		// 根据部门id查询merchantId
+		PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId);
+		if (pileMerchantInfo != null) {
+			dto.setMerchantId(String.valueOf(pileMerchantInfo.getId()));
+		}
 		startPage();
 		List<OrderListVO> list = orderBasicInfoService.selectOrderBasicInfoList(dto);
 		return getDataTable(list);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 90017e08f..753b66b3d 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -20,10 +20,7 @@ import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.MemberWalletEnum;
 import com.jsowell.common.enums.ykc.*;
 import com.jsowell.common.exception.BusinessException;
-import com.jsowell.common.util.AdapayUtil;
-import com.jsowell.common.util.DateUtils;
-import com.jsowell.common.util.SecurityUtils;
-import com.jsowell.common.util.StringUtils;
+import com.jsowell.common.util.*;
 import com.jsowell.common.util.bean.BeanUtils;
 import com.jsowell.common.util.id.IdUtils;
 import com.jsowell.common.util.id.SnowflakeIdWorker;
@@ -177,12 +174,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         }
         dto.setStationDeptIds(authorizedMap.getStationDeptIds());
         dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
-        String deptId = authorizedMap.getDeptId();
-        // 根据部门id查询merchantId
-        PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId);
-        if (pileMerchantInfo != null) {
-            dto.setMerchantId(String.valueOf(pileMerchantInfo.getId()));
-        }
         List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
         if (CollectionUtils.isNotEmpty(orderListVOS)) {
             for (OrderListVO orderListVO : orderListVOS) {