From 205fb40864a634ef71291be2638b6b0064c8de00 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Fri, 27 Dec 2024 10:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=90=8D=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/service/RoleService.java       |  5 +++--
 .../service/serviceimpl/RoleServiceImpl.java       | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/RoleService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/RoleService.java
index 368ef5b..b2c4b56 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/RoleService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/RoleService.java
@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.electromagnetic.industry.software.manage.pojo.models.Role;
 import com.electromagnetic.industry.software.manage.pojo.req.RoleDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.RolePageDTO;
-import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface RoleService extends IService<Role> {
@@ -48,9 +48,10 @@ public interface RoleService extends IService<Role> {
 
     /**
      * 获取所有角色名
+     *
      * @return
      */
-    List<String> getAllRoleNames();
+    List<HashMap<String, String>> getAllRoleNames();
 
     /**
      * 通过角色名称查看角色权限
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
index 08a3bf3..b624a0e 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
@@ -218,15 +218,25 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
 
     /**
      * 获取所有角色名
+     *
      * @return
      */
     @Transactional
     @Override
-    public List<String> getAllRoleNames() {
+    public List<HashMap<String, String>> getAllRoleNames() {
         LambdaQueryWrapper<Role> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Role::getRoleName)
                 .eq(Role::getEffectFlag, EffectFlagEnum.EFFECT.code);
-        return this.listObjs(queryWrapper).stream().map(Object::toString).collect(Collectors.toList());
+
+        List<String> roleNames = this.listObjs(queryWrapper).stream().map(Object::toString).collect(Collectors.toList());
+        List<HashMap<String,String>> result = new ArrayList<>();
+        for (String roleName : roleNames) {
+            HashMap<String, String> map = new HashMap<>();
+            map.put("value", roleName);
+            map.put("label", roleName);
+            result.add(map);
+        }
+        return result;
     }
 
     /**