Merge remote-tracking branch 'origin/dev_20260131_youshen430' into dev_20260131_youshen430

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -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();

sckw-auth/src/main/resources/bootstrap-prod.yml

@@ -19,7 +19,7 @@ spring:
         file-extension: yaml
         shared-configs:
           - data-id: sckw-common.yml
-            group: sckw-common
+            group: sckw-ng-common
             refresh: true
         #可以读多个配置文件 需要在同一个命名空间下面可以是不同的组
         extension-configs:

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -245,15 +245,16 @@ public class KwsUserService {
             kwsMenus = kwsMenus.stream().filter(item -> item.getClientType().equals(Global.NUMERICAL_TWO)).collect(Collectors.toList());
 
             //企业属性 （1供应商，2采购商，34PL物流，43PL物流）
-            if (org.apache.commons.lang3.StringUtils.equals("1", reqDto.getEntTypes())) {
-                editRoleReqVo.setName("供应商管理员");
-            } else if (org.apache.commons.lang3.StringUtils.equals("2", reqDto.getEntTypes())) {
-                editRoleReqVo.setName("采购商管理员");
-            } else if (org.apache.commons.lang3.StringUtils.equals("3", reqDto.getEntTypes())) {
-                editRoleReqVo.setName("物流商管理员");
-            } else {
-                editRoleReqVo.setName(Global.MANAGE_NAME);
-            }
+//            if (org.apache.commons.lang3.StringUtils.equals("1", reqDto.getEntTypes())) {
+//                editRoleReqVo.setName("供应商管理员");
+//            } else if (org.apache.commons.lang3.StringUtils.equals("2", reqDto.getEntTypes())) {
+//                editRoleReqVo.setName("采购商管理员");
+//            } else if (org.apache.commons.lang3.StringUtils.equals("3", reqDto.getEntTypes())) {
+//                editRoleReqVo.setName("物流商管理员");
+//            } else {
+//                editRoleReqVo.setName(Global.MANAGE_NAME);
+//            }
+            editRoleReqVo.setName(Global.MANAGE_NAME);
             editRoleReqVo.setCurrentUnitId(null);
             editRoleReqVo.setMenuIds(String.join(Global.COMMA, kwsMenus.stream().map(KwsMenu::getId).map(String::valueOf).toList()));
             editRoleReqVo.setVisiblePersonal(false);