parent
2af1db738b
commit
b2184760ac
|
|
@ -155,14 +155,10 @@ public class AuthorizationServiceImpl implements AuthorizationService {
|
|||
if (user.getIsAdmin()) {
|
||||
roleNames.add("admin");
|
||||
}
|
||||
Long headShopId = StpKit.USER.getHeadShopId(shopInfo.getId());
|
||||
if (headShopId.equals(shopInfo.getId())) {
|
||||
} else {
|
||||
boolean isEnableSync = StpKit.USER.isEnableSync(headShopId);
|
||||
if (isEnableSync && CollUtil.contains(roleNames, "商户")) {
|
||||
roleNames.remove("商户");
|
||||
roleNames.remove("分店商户");
|
||||
}
|
||||
boolean isEnableSync = StpKit.USER.isEnableSync(shopInfo.getId());
|
||||
if (isEnableSync && CollUtil.contains(roleNames, "商户")) {
|
||||
roleNames.remove("商户");
|
||||
roleNames.add("分店商户");
|
||||
}
|
||||
StpKit.USER.addRoleList(roleNames);
|
||||
// 权限赋予
|
||||
|
|
@ -220,14 +216,10 @@ public class AuthorizationServiceImpl implements AuthorizationService {
|
|||
if (sysUser.getIsAdmin()) {
|
||||
roleNames.add("admin");
|
||||
}
|
||||
Long headShopId = StpKit.USER.getHeadShopId(shopInfo.getId());
|
||||
if (headShopId.equals(shopInfo.getId())) {
|
||||
} else {
|
||||
boolean isEnableSync = StpKit.USER.isEnableSync(headShopId);
|
||||
if (isEnableSync && CollUtil.contains(roleNames, "商户")) {
|
||||
roleNames.remove("商户");
|
||||
roleNames.remove("分店商户");
|
||||
}
|
||||
boolean isEnableSync = StpKit.USER.isEnableSync(shopInfo.getId());
|
||||
if (isEnableSync && CollUtil.contains(roleNames, "商户")) {
|
||||
roleNames.remove("商户");
|
||||
roleNames.add("分店商户");
|
||||
}
|
||||
StpKit.USER.addRoleList(roleNames);
|
||||
// 权限赋予
|
||||
|
|
|
|||
Loading…
Reference in New Issue