From 6ee0c7abed78a110eacb8f2b92fece0d29bc2292 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 07 七月 2025 17:12:12 +0800
Subject: [PATCH] bug修改

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index c468218..1498593 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -221,18 +221,27 @@
     @RequestMapping("/siteDetailsOfSearch")
     @ResponseBody
     public Object siteDetailsOfSearch(String provinceId,String cityId,Integer operatorId,String storeName){
+        List<Map<String, Object>> res = new ArrayList<>();
         Integer storeId = null;
         if (UserExt.getUser().getObjectType()== 2){
             // 筛选这个运营商下的门店
             operatorId = UserExt.getUser().getObjectId();
-        }
-        if (UserExt.getUser().getObjectType()== 3){
+            List<Integer> storeIds = storeService.lambdaQuery().eq(TStore::getOperatorId, operatorId).list()
+                    .stream().map(TStore::getId).collect(Collectors.toList());
+            if (storeIds.isEmpty()){
+                storeIds.add(0);
+            }
+            res = storeService.querySiteListOfpageOperator(provinceId,cityId,operatorId,storeName,storeIds);
+        }else if (UserExt.getUser().getObjectType()== 3){
             // 筛选这个运营商下的门店
             storeId = UserExt.getUser().getObjectId();
+            res = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,storeId);
+        }else{
+            List<Integer> storeIds = new ArrayList<>();
+            res = storeService.querySiteListOfpageOperator(provinceId,cityId,operatorId,storeName,storeIds);
         }
-        List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,storeId);
-        if (storeList.size() > 0 ){
-            for (Map<String, Object> stringObjectMap : storeList) {
+        if (res.size() > 0 ){
+            for (Map<String, Object> stringObjectMap : res) {
                 String provinceName = (String) stringObjectMap.get("province");
                 String cityName = (String) stringObjectMap.get("city");
                 stringObjectMap.put("provinceCity",provinceName+cityName);
@@ -255,7 +264,7 @@
 
             }
         }
-        return storeList;
+        return res;
     }
 
     /**

--
Gitblit v1.7.1