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 { @@ -48,9 +48,10 @@ public interface RoleService extends IService { /** * 获取所有角色名 + * * @return */ - List getAllRoleNames(); + List> 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 implements Ro /** * 获取所有角色名 + * * @return */ @Transactional @Override - public List getAllRoleNames() { + public List> getAllRoleNames() { LambdaQueryWrapper 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 roleNames = this.listObjs(queryWrapper).stream().map(Object::toString).collect(Collectors.toList()); + List> result = new ArrayList<>(); + for (String roleName : roleNames) { + HashMap map = new HashMap<>(); + map.put("value", roleName); + map.put("label", roleName); + result.add(map); + } + return result; } /**