From c866ad4f41522dcc3d9a184720afe2f508f7d957 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 11 Mar 2025 16:34:55 +0800
Subject: [PATCH] areaid

---
 .../src/main/java/com/bonus/system/api/domain/SysRole.java | 6 +++---
 .../src/main/java/com/bonus/system/domain/SysRoleArea.java | 7 +++----
 .../com/bonus/system/service/impl/SysRoleServiceImpl.java  | 2 +-
 3 files changed, 7 insertions(+), 8 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 aa1a271..64130bd 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
@@ -79,7 +79,7 @@ public class SysRole extends BaseEntity
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long areaId;
 
-    private Long[] areaIds;
+    private String[] areaIds;
 
     /** 角色菜单权限 */
     private Set<String> permissions;
@@ -256,11 +256,11 @@ public class SysRole extends BaseEntity
         this.areaId = areaId;
     }
 
-    public Long[] getAreaIds() {
+    public String[] getAreaIds() {
         return areaIds;
     }
 
-    public void setAreaIds(Long[] areaIds) {
+    public void setAreaIds(String[] areaIds) {
         this.areaIds = areaIds;
     }
 
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysRoleArea.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysRoleArea.java
index 2b9d722..62a6be8 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysRoleArea.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysRoleArea.java
@@ -15,8 +15,7 @@ public class SysRoleArea
     private Long roleId;
     
     /** 区域ID */
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long areaId;
+    private String areaId;
 
     public Long getRoleId()
     {
@@ -28,11 +27,11 @@ public class SysRoleArea
         this.roleId = roleId;
     }
 
-    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/service/impl/SysRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java
index 868b9b2..d423ffc 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
@@ -386,7 +386,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         int rows = 1;
         // 新增角色与区域（数据权限）管理
         List<SysRoleArea> list = new ArrayList<SysRoleArea>();
-        for (Long areaId : role.getAreaIds())
+        for (String areaId : role.getAreaIds())
         {
             SysRoleArea rd = new SysRoleArea();
             rd.setRoleId(role.getRoleId());