|
|
@@ -355,6 +355,13 @@ public class AuthServiceImpl implements IAuthService {
|
|
|
List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),0,loginRes.getEntTypes());
|
|
|
if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(tabBar)) {
|
|
|
loginRes.setTabBar(tabBar);
|
|
|
+ if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "1") ) {
|
|
|
+ loginRes.setRoleName("供应商管理员");
|
|
|
+ } else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "2")) {
|
|
|
+ loginRes.setRoleName("采购商管理员");
|
|
|
+ }else if (org.apache.commons.lang3.StringUtils.equals(loginRes.getEntTypes(), "3")) {
|
|
|
+ loginRes.setRoleName("物流商管理员");
|
|
|
+ }
|
|
|
}
|
|
|
applyAppModulePermissions(loginRes, loginBase, user.getRoleName());
|
|
|
if (user.getSystemType().equals(SystemTypeEnum.MANAGE.getCode())) {
|
|
|
@@ -975,9 +982,9 @@ public class AuthServiceImpl implements IAuthService {
|
|
|
boolean isLogistics = StringUtils.isNotBlank(roleName) && roleName.contains("物流");
|
|
|
boolean isFinance = StringUtils.isNotBlank(roleName) && roleName.contains("财务");
|
|
|
//企业属性 （1供应商，2采购商，34PL物流，43PL物流）
|
|
|
- boolean isSupplierAdmin = StringUtils.isNotBlank(roleName) && roleName.contains("供应商管理员") && org.apache.commons.lang3.StringUtils.equals(entTypeNames, "1") ;
|
|
|
- boolean isLogisticsAdmin = StringUtils.isNotBlank(roleName) && roleName.contains("物流商管理员") && org.apache.commons.lang3.StringUtils.equals(entTypeNames, "3");
|
|
|
- boolean isPurchaseAdmin = StringUtils.isNotBlank(roleName) && roleName.contains("采购商管理员") && org.apache.commons.lang3.StringUtils.equals(entTypeNames, "2");
|
|
|
+ boolean isSupplierAdmin = StringUtils.isNotBlank(roleName) && roleName.contains("系统管理员") && org.apache.commons.lang3.StringUtils.equals(entTypeNames, "1") ;
|
|
|
+ boolean isLogisticsAdmin = StringUtils.isNotBlank(roleName) && roleName.contains("系统管理员") && org.apache.commons.lang3.StringUtils.equals(entTypeNames, "3");
|
|
|
+ boolean isPurchaseAdmin = StringUtils.isNotBlank(roleName) && roleName.contains("系统管理员") && org.apache.commons.lang3.StringUtils.equals(entTypeNames, "2");
|
|
|
|
|
|
if (isDoorKeeper) {
|
|
|
return buildDoorKeeperTabBar();
|
chenxiaofei