czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'prod' into test

Browse Source
This commit is contained in:
gong
2025-09-11 16:39:35 +08:00
parent 0f922d6978 3f252fa669
commit e6b88058b8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
View File

@@ -167,20 +167,19 @@ public class AuthorizationServiceImpl implements AuthorizationService {
roleNames.add("分店商户"); roleNames.add("分店商户");
List<String> headShopPromissionList = sysMenuMapper.selectByRoleId(2L).stream().map(SysMenu::getPermission).filter(StrUtil::isNotBlank).toList(); List<String> headShopPromissionList = sysMenuMapper.selectByRoleId(2L).stream().map(SysMenu::getPermission).filter(StrUtil::isNotBlank).toList();
List<String> branchShopPromissionList = sysMenuMapper.selectByRoleId(3L).stream().map(SysMenu::getPermission).filter(StrUtil::isNotBlank).toList(); List<String> branchShopPromissionList = sysMenuMapper.selectByRoleId(3L).stream().map(SysMenu::getPermission).filter(StrUtil::isNotBlank).toList();
promissionList.removeAll(headShopPromissionList); // promissionList.removeAll(headShopPromissionList);
promissionList.addAll(branchShopPromissionList); promissionList.addAll(branchShopPromissionList);
} }
StpKit.USER.addRoleList(roleNames); StpKit.USER.addRoleList(roleNames);
StpKit.USER.addPermissionList(promissionList); StpKit.USER.addPermissionList(promissionList);
String platformType = ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"); if (PlatformTypeEnum.PC_CLIENT.getValue().equals(platType)) {
if (PlatformTypeEnum.PC_CLIENT.getValue().equals(platformType)) {
// 初始化交班记录 // 初始化交班记录
HandoverRecord entity = getHandoverRecord(isStaff, shopInfo, shopStaff); HandoverRecord entity = getHandoverRecord(isStaff, shopInfo, shopStaff);
handoverRecordService.initHandoverRecord(entity); handoverRecordService.initHandoverRecord(entity);
} }
redisService.del(RedisCst.LOGIN_CODE + loginDTO.uuid()); 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 @Override