From 8f6ed072d1dc965271c46f10dec85490cd6b111c Mon Sep 17 00:00:00 2001
From: suzhuhong <zhuhong.su@coolcollege.cn>
Date: Fri, 2 Jan 2026 12:15:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=86=85=E5=8B=A4=E7=9C=8B?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E7=AE=A1=E8=BE=96=E8=8C=83=E5=9B=B4=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ShopInfoMapper.xml     | 12 ++++++------
 .../com/cool/store/service/impl/ShopServiceImpl.java |  6 +-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index a342677b7..829c67e85 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -376,16 +376,16 @@
             and (a.investment_manager = #{userId} or a.operations_consultant = #{userId})
         </if>
         <if test="request.authRegionIds != null and request.authRegionIds.size() > 0">
-            and a.region_id in
+            and (
+            a.region_id in
             <foreach collection="request.authRegionIds" item="regionId" index="index" open="(" separator="," close=")">
                 #{regionId}
             </foreach>
-        </if>
-        <if test="request.authInvestRegionIds != null and request.authInvestRegionIds.size() > 0">
-            and a.invest_region_id in
-            <foreach collection="request.authInvestRegionIds" item="investRegionId" index="index" open="(" separator="," close=")">
-                #{investRegionId}
+            or a.invest_region_id in
+            <foreach collection="request.authRegionIds" item="regionId" index="index" open="(" separator="," close=")">
+                #{regionId}
             </foreach>
+            )
         </if>
         order by a.update_time desc
     </select>
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
index 1a69c046a..1f24d6a26 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
@@ -549,11 +549,7 @@ public class ShopServiceImpl implements ShopService {
                 }
                 List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(userId);
                 // 招商经理查询招商区域invest_region_id，否则查询运营区域region_id
-                if (userRoleIds.contains(UserRoleEnum.INVESTMENT_MANGER.getCode())) {
-                    request.setAuthInvestRegionIds(authRegionIds);
-                } else {
-                    request.setAuthRegionIds(authRegionIds);
-                }
+                request.setAuthRegionIds(authRegionIds);
             }
         }
         if (CollectionUtils.isNotEmpty(request.getRegionIds())) {