切换店铺统计 √
下单选择会员 √ 注册会员 √ 完善手机号 √ 会员流水信息同步 √
This commit is contained in:
@@ -155,14 +155,10 @@ public class AuthorizationServiceImpl implements AuthorizationService {
|
|||||||
if (user.getIsAdmin()) {
|
if (user.getIsAdmin()) {
|
||||||
roleNames.add("admin");
|
roleNames.add("admin");
|
||||||
}
|
}
|
||||||
Long headShopId = StpKit.USER.getHeadShopId(shopInfo.getId());
|
boolean isEnableSync = StpKit.USER.isEnableSync(shopInfo.getId());
|
||||||
if (headShopId.equals(shopInfo.getId())) {
|
if (isEnableSync && CollUtil.contains(roleNames, "商户")) {
|
||||||
} else {
|
roleNames.remove("商户");
|
||||||
boolean isEnableSync = StpKit.USER.isEnableSync(headShopId);
|
roleNames.add("分店商户");
|
||||||
if (isEnableSync && CollUtil.contains(roleNames, "商户")) {
|
|
||||||
roleNames.remove("商户");
|
|
||||||
roleNames.remove("分店商户");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
StpKit.USER.addRoleList(roleNames);
|
StpKit.USER.addRoleList(roleNames);
|
||||||
// 权限赋予
|
// 权限赋予
|
||||||
@@ -220,14 +216,10 @@ public class AuthorizationServiceImpl implements AuthorizationService {
|
|||||||
if (sysUser.getIsAdmin()) {
|
if (sysUser.getIsAdmin()) {
|
||||||
roleNames.add("admin");
|
roleNames.add("admin");
|
||||||
}
|
}
|
||||||
Long headShopId = StpKit.USER.getHeadShopId(shopInfo.getId());
|
boolean isEnableSync = StpKit.USER.isEnableSync(shopInfo.getId());
|
||||||
if (headShopId.equals(shopInfo.getId())) {
|
if (isEnableSync && CollUtil.contains(roleNames, "商户")) {
|
||||||
} else {
|
roleNames.remove("商户");
|
||||||
boolean isEnableSync = StpKit.USER.isEnableSync(headShopId);
|
roleNames.add("分店商户");
|
||||||
if (isEnableSync && CollUtil.contains(roleNames, "商户")) {
|
|
||||||
roleNames.remove("商户");
|
|
||||||
roleNames.remove("分店商户");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
StpKit.USER.addRoleList(roleNames);
|
StpKit.USER.addRoleList(roleNames);
|
||||||
// 权限赋予
|
// 权限赋予
|
||||||
|
|||||||
Reference in New Issue
Block a user