From a845073aa91d68d5dd31dd278ce2d18ff97da9ea Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Fri, 18 Jul 2025 11:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E6=9D=83=E9=99=90=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/domain/vo/RoleVo.java     |  3 +++
 .../java/com/example/demo/mapper/RoleMapper.java    |  4 ++--
 .../example/demo/serviceImpl/RoleServiceImpl.java   | 16 +++++++++++++++-
 src/main/resources/mapper/RoleMapper.xml            | 21 ++++++++++++++++++---
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/RoleVo.java b/src/main/java/com/example/demo/domain/vo/RoleVo.java
index bbcaca4..fbb111f 100644
--- a/src/main/java/com/example/demo/domain/vo/RoleVo.java
+++ b/src/main/java/com/example/demo/domain/vo/RoleVo.java
@@ -31,6 +31,7 @@ public class RoleVo implements Serializable {
     private Integer priority;//优先级
     private Integer fatherId;//上级角色id
     private String fatherName;//上级角色名称
+    private String market;//所属市场
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime; // 创建时间
 
@@ -40,4 +41,6 @@ public class RoleVo implements Serializable {
     List<Integer> menuIds;//拥有的菜单id
 
     List<MenuVo> tree;//菜单树
+
+    private List<String> markets; // 地区列表
 }
diff --git a/src/main/java/com/example/demo/mapper/RoleMapper.java b/src/main/java/com/example/demo/mapper/RoleMapper.java
index 51a5afa..51fb1e0 100644
--- a/src/main/java/com/example/demo/mapper/RoleMapper.java
+++ b/src/main/java/com/example/demo/mapper/RoleMapper.java
@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Random;
 
 /**
  * @program: gold-java
@@ -27,8 +26,9 @@ public interface RoleMapper {
 
     //查找角色id
     Role selectByRoleId(Integer id);
+
     //查找全部角色
-    List<RoleVo> selectAllRole();
+    List<RoleVo> selectAllRole(List<String> markets);
 
     //新建角色
     void addRole(RoleVo roleVo);
diff --git a/src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java
index 3238626..386bde2 100644
--- a/src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java
@@ -7,6 +7,8 @@ import com.example.demo.domain.vo.Result;
 import com.example.demo.domain.vo.RoleVo;
 import com.example.demo.mapper.RefundMapper;
 import com.example.demo.mapper.RoleMapper;
+import com.example.demo.service.AdminService;
+import com.example.demo.service.GeneralService;
 import com.example.demo.service.MenuService;
 import com.example.demo.service.RoleService;
 import com.github.pagehelper.PageHelper;
@@ -33,6 +35,10 @@ public class RoleServiceImpl implements RoleService {
     private RoleMapper roleMapper;
     @Autowired
     private MenuService menuService;
+    @Autowired
+    private AdminService adminService;
+    @Autowired
+    private GeneralService generalService;
 
     //新增角色
     @Override
@@ -51,6 +57,9 @@ public class RoleServiceImpl implements RoleService {
         if (roleVo.getMenuIds() == null || roleVo.getMenuIds().isEmpty()) {
             return Result.error("权限为空");
         }
+        if(roleVo.getMarket() == null|| roleVo.getMarket().isEmpty()){
+            return Result.error("所属市场为空");
+        }
         else {
             if(roleVo.getFatherId() != 2) {
                 for(Integer menuId : roleVo.getMenuIds()){
@@ -106,7 +115,9 @@ public class RoleServiceImpl implements RoleService {
     //查找全部角色
     @Override
     public List<RoleVo> selectAllRole() {
-        return roleMapper.selectAllRole();
+        String account = adminService.getCurrentAdminAccount();
+        List<String> markets = generalService.getRoleMarket(account);
+        return roleMapper.selectAllRole(markets);
     }
 
     @Override
@@ -117,6 +128,9 @@ public class RoleServiceImpl implements RoleService {
     //分页查找角色
     @Override
     public PageInfo<RoleVo> selectBy(Integer pageNum, Integer pageSize, RoleVo roleVo) {
+        String account = adminService.getCurrentAdminAccount();
+        List<String> markets = generalService.getRoleMarket(account);
+        roleVo.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
         List<RoleVo> roleVos = roleMapper.selectBy(roleVo);
         // 遍历 roleVos 列表
diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml
index 94f74e0..bf5a640 100644
--- a/src/main/resources/mapper/RoleMapper.xml
+++ b/src/main/resources/mapper/RoleMapper.xml
@@ -19,6 +19,15 @@
 
     <select id="selectAllRole" resultType="com.example.demo.domain.vo.RoleVo">
         SELECT id,role_name FROM role
+        <where>
+            <!-- 判断 market 是否不为总部且 markets 不为空 -->
+            <if test="markets != null and markets.size() > 0 and '总部' not in markets">
+                AND market IN
+                <foreach collection="markets" item="market" open="(" close=")" separator=",">
+                    #{market}
+                </foreach>
+            </if>
+        </where>
     </select>
     <select id="selectByFatherId" resultType="com.example.demo.domain.vo.RoleVo">
         SELECT id,role_name,priority FROM role
@@ -31,9 +40,8 @@
     <!-- 插入角色信息 -->
     <insert id="addRole" parameterType="com.example.demo.domain.vo.RoleVo" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO role
-            (role_name, priority, father_id)
-        VALUES
-            (#{roleName}, #{priority}, #{fatherId})
+            (role_name, priority, father_id, market)
+        VALUES (#{roleName}, #{priority}, #{fatherId}, #{market})
     </insert>
 
     <!-- 删除 role_menu 表中对应角色的数据 -->
@@ -57,6 +65,13 @@
         -- 自连接，通过 father_id 关联父角色
         LEFT JOIN role father ON r.father_id = father.id
         <where>
+            <!-- 判断 market 是否不为总部且 markets 不为空 -->
+            <if test="markets != null and markets.size() > 0 and '总部' not in markets">
+                AND r.market IN
+                <foreach collection="markets" item="market" open="(" close=")" separator=",">
+                    #{market}
+                </foreach>
+            </if>
             <if test="roleName != null and roleName != ''">
                 r.role_name LIKE CONCAT('%', #{roleName}, '%')
             </if>