|
@@ -10,7 +10,6 @@ import com.ruoyi.common.core.domain.entity.SysRole;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.helper.LoginHelper;
|
|
|
-import com.ruoyi.common.utils.spring.SpringUtils;
|
|
|
import com.ruoyi.system.domain.SysRoleDept;
|
|
|
import com.ruoyi.system.domain.SysRoleMenu;
|
|
|
import com.ruoyi.system.domain.SysUserRole;
|
|
@@ -102,7 +101,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
|
|
|
*/
|
|
|
@Override
|
|
|
public List<SysRole> selectRoleAll() {
|
|
|
- return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
|
|
|
+ return this.selectRoleList(new SysRole());
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -183,7 +182,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
|
|
|
if (!LoginHelper.isAdmin()) {
|
|
|
SysRole role = new SysRole();
|
|
|
role.setRoleId(roleId);
|
|
|
- List<SysRole> roles = SpringUtils.getAopProxy(this).selectRoleList(role);
|
|
|
+ List<SysRole> roles = this.selectRoleList(role);
|
|
|
if (CollUtil.isEmpty(roles)) {
|
|
|
throw new ServiceException("没有权限访问角色数据!");
|
|
|
}
|