diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java index b17d24f..20f7448 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java @@ -25,9 +25,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; -import static com.bonus.system.config.MaterialConstants.ADMIN_ID; -import static com.bonus.system.config.MaterialConstants.PROVINCE_COMPANY_DEPT_ID; - /** * 角色 业务层处理 * @@ -77,11 +74,11 @@ public class SysRoleServiceImpl implements ISysRoleService { Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); Long userId = SecurityUtils.getLoginUser().getUserid(); // 管理员和省公司可查看所有数据 - if (userId != null && deptId != null - && !userId.equals(ADMIN_ID) - && !deptId.equals(PROVINCE_COMPANY_DEPT_ID)) { - role.setCompanyId(deptId); - } +// if (userId != null && deptId != null +// && !userId.equals(ADMIN_ID) +// && !deptId.equals(PROVINCE_COMPANY_DEPT_ID)) { +// role.setCompanyId(deptId); +// } //role.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); return roleMapper.selectRoleList(role); }