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

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

@@ -3,22 +3,22 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
       config:
         # 配置中心地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
         # 配置文件格式
         file-extension: yaml
         shared-configs:
-          - data-id: sckw-system-common.yml
+          - data-id: sckw-common.yml
             group: sckw-ng-common
             refresh: true
 

sckw-gateway/src/main/resources/bootstrap-cxf.yml

@@ -3,16 +3,16 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
       config:
         # 配置中心地址
-        server-addr: @nacos.server@
+        server-addr: 118.116.4.155:8848
         # 命名空间
-        namespace: @nacos.namespace@
+        namespace: sckw-ng-service-platform-xf
         # 共享配置
         group: sckw-ng-service-platform
         # 配置文件格式

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/server/DataPermissionServerController.java

@@ -33,7 +33,12 @@ public class DataPermissionServerController {
      */
     @PostMapping("/filter")
     public DataPermissionDTO getDataPermissionFilter(@RequestBody DataPermissionFilterReqDto req) {
-        return dataPermissionHelper.buildPermissionDTO(req.getUserId(), req.getRoleId(), req.isManager());
+
+        DataPermissionDTO dto = new DataPermissionDTO();
+        dto.setAllVisible(true);
+        dto.setPersonalDataEnabled(false);
+        return dto;
+//        return dataPermissionHelper.buildPermissionDTO(req.getUserId(), req.getRoleId(), req.isManager());
     }
 
 }

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

@@ -308,10 +308,13 @@ public class KwsMenuService {
         } else {
             finalList = menuList;
         }
+        if (Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.COMPANY.getCode()) ) {
+//            if (Boolean.TRUE.equals(reqVo.getIncludeButton())) {
 //
-//        if (Boolean.TRUE.equals(reqVo.getIncludeButton())) {
-//            finalList = supplementButtons(finalList);
-//        }
+//            }
+            finalList = supplementButtons(finalList);
+        }
+
 
         List<KwsMenuResVo> rootList = new ArrayList<>();