diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java index e98091a2..bca5c65b 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java @@ -167,20 +167,19 @@ public class AuthorizationServiceImpl implements AuthorizationService { roleNames.add("分店商户"); List headShopPromissionList = sysMenuMapper.selectByRoleId(2L).stream().map(SysMenu::getPermission).filter(StrUtil::isNotBlank).toList(); List branchShopPromissionList = sysMenuMapper.selectByRoleId(3L).stream().map(SysMenu::getPermission).filter(StrUtil::isNotBlank).toList(); - promissionList.removeAll(headShopPromissionList); +// promissionList.removeAll(headShopPromissionList); promissionList.addAll(branchShopPromissionList); } StpKit.USER.addRoleList(roleNames); StpKit.USER.addPermissionList(promissionList); - String platformType = ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"); - if (PlatformTypeEnum.PC_CLIENT.getValue().equals(platformType)) { + if (PlatformTypeEnum.PC_CLIENT.getValue().equals(platType)) { // 初始化交班记录 HandoverRecord entity = getHandoverRecord(isStaff, shopInfo, shopStaff); handoverRecordService.initHandoverRecord(entity); } redisService.del(RedisCst.LOGIN_CODE + loginDTO.uuid()); - return new LoginVO(StpKit.USER.getTokenInfo(), new ArrayList<>(), loginDTO.loginType(), shopInfo, shopStaff); + return new LoginVO(StpKit.USER.getTokenInfo(), promissionList, loginDTO.loginType(), shopInfo, shopStaff); } @Override