From 6ad9216f3bcf4e4119e7faa541355812021a7f1c Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 13 Mar 2025 14:41:48 +0800
Subject: [PATCH] sys_role

---
 .../java/com/bonus/system/api/domain/SysRole.java     |  7 +++----
 .../java/com/bonus/system/mapper/SysRoleMapper.java   |  4 ++++
 .../bonus/system/service/impl/SysRoleServiceImpl.java |  9 ++++++++-
 .../main/resources/mapper/system/SysRoleMapper.xml    | 11 +++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
index 70afe29..a7f97cb 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
@@ -76,8 +76,7 @@ public class SysRole extends BaseEntity
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long companyId;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long areaId;
+    private String areaId;
 
     private String[] areaIds;
 
@@ -250,11 +249,11 @@ public class SysRole extends BaseEntity
         this.companyId = companyId;
     }
 
-    public Long getAreaId() {
+    public String getAreaId() {
         return areaId;
     }
 
-    public void setAreaId(Long areaId) {
+    public void setAreaId(String areaId) {
         this.areaId = areaId;
     }
 
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java
index e9c39b9..07ad027 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java
@@ -104,4 +104,8 @@ public interface SysRoleMapper
      * @return 结果
      */
     public int deleteRoleByIds(Long[] roleIds);
+
+    public List<String> getAreaIdsByRoleId(Long roleId);
+
+    public List<String> getDataIdsByRoleId(Long roleId);
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java
index 24deb69..896483a 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java
@@ -81,7 +81,14 @@ public class SysRoleServiceImpl implements ISysRoleService
             role.setRoleKey(str);
         }
         role.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
-        return roleMapper.selectRoleList(role);
+        List<SysRole> roles = roleMapper.selectRoleList(role);
+        for (SysRole r : roles) {
+            List<String> areaIds = roleMapper.getAreaIdsByRoleId(r.getRoleId());
+            List<String> dataIds = roleMapper.getDataIdsByRoleId(r.getRoleId());
+            r.setAreaIds(areaIds.toArray(new String[areaIds.size()]));
+            r.setDataIds(dataIds.toArray(new String[dataIds.size()]));
+        }
+        return roles;
     }
 
     /**
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
index f1cf515..427eb6a 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -176,4 +176,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
  	</delete>
 
+	<select id="getAreaIdsByRoleId" resultType="String">
+		select area_id
+		from sys_role_area
+		where role_id = #{roleId}
+	</select>
+
+	<select id="getDataIdsByRoleId" resultType="String">
+		select data_id
+		from sys_role_canteen
+		where role_id = #{roleId}
+	</select>
 </mapper>