From fa8fa3249940569797c929cd181306062afb3cf8 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Wed, 23 Jul 2025 10:40:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=B7=A5=E5=85=B7=E7=B1=BB?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/mapper/GeneralMapper.java   |  1 +
 src/main/java/com/example/demo/service/GeneralService.java |  2 ++
 .../com/example/demo/serviceImpl/GeneralServiceImpl.java   |  8 +++++++-
 src/main/resources/mapper/GeneralMapper.xml                |  3 +++
 src/main/resources/mapper/PermissionMapper.xml             | 14 +++++++-------
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/GeneralMapper.java b/src/main/java/com/example/demo/mapper/GeneralMapper.java
index f9d39fe..49d6d76 100644
--- a/src/main/java/com/example/demo/mapper/GeneralMapper.java
+++ b/src/main/java/com/example/demo/mapper/GeneralMapper.java
@@ -15,6 +15,7 @@ import java.util.List;
 @Mapper
 public interface GeneralMapper {
     List<String> getMarket();
+    List<String> getALLAdminMarket();
     List<String> getPlatform();
     //获取商品
     List<String> getGoods();
diff --git a/src/main/java/com/example/demo/service/GeneralService.java b/src/main/java/com/example/demo/service/GeneralService.java
index ad82643..67e4b5f 100644
--- a/src/main/java/com/example/demo/service/GeneralService.java
+++ b/src/main/java/com/example/demo/service/GeneralService.java
@@ -18,6 +18,8 @@ import java.util.List;
 public interface GeneralService {
     //获取所有市场（地区）
     List<String> getMarket();
+    //获取所有管理员市场（地区）
+    List<String> getALLAdminMarket();
     //获取平台
     List<String> getPlatform();
     //获取商品
diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
index 70aa6a7..f9b3ba5 100644
--- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
@@ -36,6 +36,12 @@ public class GeneralServiceImpl implements GeneralService {
     }
 
     @Override
+    public List<String> getALLAdminMarket() {
+        List<String> list = generalMapper.getALLAdminMarket();
+        return list;
+    }
+
+    @Override
     public List<String> getPlatform() {
         List<String> list = generalMapper.getPlatform();
         return list;
@@ -125,7 +131,7 @@ public class GeneralServiceImpl implements GeneralService {
             List<String> list = Arrays.asList(market.split(","));
             //判断是否是总部
             if (list != null && list.contains("总部")) {
-                list=getMarket();//总部有所有地区的权限
+                list=getALLAdminMarket();//总部有所有地区的权限
             }
             return list;
         } catch (Exception e) {
diff --git a/src/main/resources/mapper/GeneralMapper.xml b/src/main/resources/mapper/GeneralMapper.xml
index 0438fc9..8fc1952 100644
--- a/src/main/resources/mapper/GeneralMapper.xml
+++ b/src/main/resources/mapper/GeneralMapper.xml
@@ -5,6 +5,9 @@
     <select id="getMarket" resultType="java.lang.String">
             select DISTINCT market from user
     </select>
+    <select id="getALLAdminMarket" resultType="java.lang.String">
+        select DISTINCT market from admin
+    </select>
     <select id="getPlatform" resultType="java.lang.String">
         select DISTINCT pay_platform from user_gold_record
     </select>
diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml
index 8e6376d..944e7fd 100644
--- a/src/main/resources/mapper/PermissionMapper.xml
+++ b/src/main/resources/mapper/PermissionMapper.xml
@@ -75,13 +75,6 @@
         from admin
         LEFT JOIN role on admin.role_id=role.id
         <where>
-            <if test="markets != null and markets.size() > 0 and '总部' not in markets">
-                AND (
-                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
-                    admin.market LIKE CONCAT('%', #{market}, '%')
-                </foreach>
-                )
-            </if>
             <if test="account!=null and account.length>0">
                 and admin.account=#{account}
             </if>
@@ -91,6 +84,13 @@
             <if test="postiton!=null and postiton.length>0">
                 and admin.postiton=#{postiton}
             </if>
+            <if test="markets != null and markets.size() > 0 and '总部' not in markets">
+                AND (
+                <foreach collection="markets" item="market" open="" close="" separator=" OR ">
+                    admin.market LIKE CONCAT('%', #{market}, '%')
+                </foreach>
+                )
+            </if>
         </where>
         order by admin.admin_status desc
     </select>