|
@@ -40,6 +40,9 @@ public class CxCommonController {
|
|
|
@Value("#{'${pagepart.blacklist}'.split(',')}")
|
|
|
private List<String> blackListPagePartIds;
|
|
|
|
|
|
+ @Value("#{'${control.rolecode}'.split(',')}")
|
|
|
+ private List<String> controlRoleCode;
|
|
|
+
|
|
|
private final Logger logger = LoggerFactory.getLogger(getClass());
|
|
|
|
|
|
public static final SearchColumnVo SEARCH_COLUMN_VO = new SearchColumnVo() {{
|
|
@@ -83,8 +86,8 @@ public class CxCommonController {
|
|
|
logger.error("无法获取到当前登陆人的角色信息");
|
|
|
return R.ok(criteriaQuery);
|
|
|
}
|
|
|
- // 判断是否拥有集团领导角色
|
|
|
- SysRoleDo sysRoleDo = roleDos.stream().filter(role -> GROUP_LEADER.equals(role.getCode())).findFirst().orElse(null);
|
|
|
+ // 判断是否拥有特殊角色 只有这些角色可以看所有厂区的数据
|
|
|
+ SysRoleDo sysRoleDo = roleDos.stream().filter(role -> controlRoleCode.contains(role.getCode())).findFirst().orElse(null);
|
|
|
if (sysRoleDo != null) {
|
|
|
return R.ok(criteriaQuery);
|
|
|
}
|