肖海南权限代码修改

src/main/java/com/teaching/backend/mapper/umsAdmin/UmsPermissionMapper.java

@@ -0,0 +1,27 @@
+package com.teaching.backend.mapper.umsAdmin;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.teaching.backend.model.entity.umsAdmin.UmsPermission;
+import com.teaching.backend.model.entity.umsAdmin.UmsRole;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 后台角色管理自定义Dao
+ * Created by macro on 2020/2/2.
+ */
+@Mapper
+public interface UmsPermissionMapper extends BaseMapper<UmsPermission> {
+    /**
+     * 根据后台用户ID获取菜单
+     */
+//    List<UmsMenu> getMenuList(@Param("adminId") Long adminId);
+//    /**
+//     * 根据角色ID获取菜单
+//     */
+//    List<UmsMenu> getMenuListByRoleId(@Param("roleId") Long roleId);
+//    /**
+//     * 根据角色ID获取资源
+//     */
+//    List<UmsResource> getResourceListByRoleId(@Param("roleId") Long roleId);
+}

src/main/java/com/teaching/backend/service/umsAdmin/impl/UmsRoleServiceImpl.java

@@ -1,9 +1,12 @@
 package com.teaching.backend.service.umsAdmin.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.teaching.backend.mapper.umsAdmin.UmsPermissionMapper;
 import com.teaching.backend.mapper.umsAdmin.UmsRoleMapper;
+import com.teaching.backend.model.entity.umsAdmin.UmsPermission;
 import com.teaching.backend.model.entity.umsAdmin.UmsRole;
 import com.teaching.backend.service.umsAdmin.UmsRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -17,6 +20,8 @@ import java.util.stream.Collectors;
 @Service
 public class UmsRoleServiceImpl extends ServiceImpl<UmsRoleMapper, UmsRole> implements UmsRoleService {
 
+    @Autowired
+    private UmsPermissionMapper umsPermissionMapper;
     @Override
     public List<String> getPermissionList(String roleId) {
         Set<String> set = new HashSet<>();
@@ -25,8 +30,12 @@ public class UmsRoleServiceImpl extends ServiceImpl<UmsRoleMapper, UmsRole> impl
             UmsRole umsRole = lambdaQuery().eq(UmsRole::getId, role).one();
             if(umsRole.getStatus() == 1){
                 String[] permissions = umsRole.getPermissionId().split(",");
-                List<String> permissionList = Arrays.stream(permissions).collect(Collectors.toList());
-                set.addAll(permissionList);
+                List<String> permissionNameList = new ArrayList<>();
+                for (String permission : permissions) {
+                    UmsPermission umsPermission = umsPermissionMapper.selectById(permission);
+                    permissionNameList.add(umsPermission.getName());
+                }
+                set.addAll(permissionNameList);
             }
         }
         List<String> permissionList = new ArrayList<>(set);