|
@@ -70,11 +70,10 @@ public class SaasAuthHandler {
|
|
|
if (account == null) {
|
|
|
throw new BusinessException("账号信息为空");
|
|
|
}
|
|
|
- // 添加数据访问控制,账号类型,0-所有集团项目,1-单集团所有项目,2-其他
|
|
|
- String accountType = account.getAccountType();
|
|
|
- // 1时,判断是否有权限
|
|
|
+ // 添加数据访问控制,账号所属,0-系统账号,1-业务账号
|
|
|
+ String accountBelong = account.getAccountBelong();
|
|
|
Map<String, String> result = new HashMap<String, String>(2);
|
|
|
- if (SaasCommonConstant.STR_STATUS_1.equals(accountType)) {
|
|
|
+ if (SaasCommonConstant.STR_STATUS_1.equals(accountBelong)) {
|
|
|
String allowGroupCode = account.getGroupCode();
|
|
|
if (StringUtil.isNotBlank(groupCode) && !groupCode.equals(allowGroupCode)) {
|
|
|
throw new BusinessException("账号无该集团的访问权限");
|
|
@@ -82,8 +81,8 @@ public class SaasAuthHandler {
|
|
|
groupCode = allowGroupCode;
|
|
|
}
|
|
|
result.put(CipherConstants.GROUP_CODE, groupCode);
|
|
|
- result.put(SaasCommonConstant.ACCOUNT_TYPE, accountType);
|
|
|
- result.put(SaasCommonConstant.ACCOUNT_BELONG, account.getAccountBelong());
|
|
|
+ result.put(SaasCommonConstant.ACCOUNT_TYPE, account.getAccountType());
|
|
|
+ result.put(SaasCommonConstant.ACCOUNT_BELONG, accountBelong);
|
|
|
return result;
|
|
|
}
|
|
|
|