问题修改
This commit is contained in:
parent
705b2aff97
commit
959da6c47f
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue