21

src/main/java/com/fdkankan/manage/service/impl/SysRoleMenuServiceImpl.java

@@ -3,10 +3,12 @@ package com.fdkankan.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.entity.SysMenu;
+import com.fdkankan.manage.entity.SysRole;
 import com.fdkankan.manage.entity.SysRoleMenu;
 import com.fdkankan.manage.mapper.ISysRoleMenuMapper;
 import com.fdkankan.manage.service.ISysMenuService;
 import com.fdkankan.manage.service.ISysRoleMenuService;
+import com.fdkankan.manage.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,6 +30,8 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<ISysRoleMenuMapper, SysR
 
     @Autowired
     ISysMenuService sysMenuService;
+    @Autowired
+    ISysRoleService sysRoleService;
 
     @Override
     public void deleteByRoleId(Long roleId) {
@@ -61,6 +65,10 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<ISysRoleMenuMapper, SysR
 
     @Override
     public List<SysRoleMenu> getByRoleId(Long roleId) {
+        SysRole role = sysRoleService.getById(roleId);
+        if(role == null || role.getStatus() == 1){
+            return new ArrayList<>();
+        }
         LambdaQueryWrapper<SysRoleMenu> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SysRoleMenu::getRoleId,roleId);
         return this.list(wrapper);