数据权限调整

authentication/src/main/resources/application.yml

@@ -8,3 +8,11 @@ mybatis-plus:
   mapper-locations: classpath*:/mapper/*Mapper.xml
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+data-scope:
+  tables:
+    - sys_system
+    - sys_user
+    - sys_user_role
+    - sys_organization_user_link
+    - sys_area

commons/src/main/java/com/jzg/commons/config/DataPermissionInterceptor.java

@@ -3,6 +3,7 @@ package com.jzg.commons.config;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
+import com.jzg.commons.constants.SystemConstants;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.entity.properties.DataScopeProperties;
 import net.sf.jsqlparser.JSQLParserException;
@@ -79,11 +80,12 @@ import java.util.regex.Pattern;
 
         String currentUserDeptId = baseController.getUserDeptId();
         String userDataScope = baseController.getUserDataScope();
+        String userSystemCode = baseController.getUserSystemCode();
         JSONObject dataScope = JSONObject.parseObject(userDataScope);
         //如果用户名为admin  不做数据权限
 
-        if (dataScope == null || (dataScope.isEmpty() && baseController.getUserName().equals("admin"))) {
-            return where;
+        if (dataScope == null || (dataScope.isEmpty() && baseController.getUserName().equals("admin")) || userSystemCode.equals(SystemConstants.SYSTEM_PLATFORM.getCode())) {
+            return null;
         }
         StringBuilder additionalSql = new StringBuilder();
         String tableName = getTableName(table);

gateway/src/main/resources/application.yml

@@ -7,17 +7,6 @@ spring:
     web-application-type: reactive
     allow-bean-definition-overriding: true
   application:
-    name: jzg-gataway
-  cloud:
-    nacos:
-      server-addr: 192.168.0.250:8848
-      username: nacos
-      password: nacos
-      config:
-        import-check:
-          enabled: false
-        file-extension: yaml
-        namespace: bfe09cf4-508a-4443-acfa-b354be6f4bac
-        group: DEFAULT_GROUP
-      discovery:
-        namespace: bfe09cf4-508a-4443-acfa-b354be6f4bac
+    name: jzg-gateway
+
+

platform/src/main/resources/application.yml

@@ -1,9 +1,6 @@
 spring:
-#  zipkin:
-#    base-url: http://192.168.0.250:9411
-#  sleuth:
-#    sampler:
-#      probability: 1.0
+  application:
+    name: jzg-platform
   main:
     allow-circular-references: true
   profiles:
@@ -54,5 +51,12 @@ tenant:
     - /userInfo/getUser
 
 data-scope:
-  ignoreTables:
-
+  tables:
+    - sys_user
+    - esm_ins_company
+    - ins_business_insurance
+    - ins_business_insurance_option
+    - ptl_agreement_attribution
+    - ptl_agreement_url
+    - ptl_ins_attribution_template
+    - sys_config

tenant/organization/src/main/resources/application.yml

@@ -1,6 +1,9 @@
 spring:
+  application:
+    name: jzg-organization
   main:
     allow-circular-references: true
+    allow-bean-definition-overriding: true
   profiles:
     active: dev
 
@@ -40,6 +43,11 @@ tenant:
     - sys_message_template
     - sys_message_user
     - sys_notice_user
+    - ptl_scheme_info
+    - ptl_scheme_insurance
+    - ptl_scheme_insurance_driving_intention
+    - ins_business_insurance_option
+    - ins_business_insurance
     - ptl_agreement_attribution
     - sys_dept
     - ptl_agreement_dept
@@ -50,5 +58,18 @@ tenant:
 
 data-scope:
   tables:
-    - sys_user_jzg_info
-    - sys_dept
+    - sys_system
+    - sys_user
+    - sys_user_role
+    - sys_organization_user_link
+    - sys_area
+    - sys_poster
+    - sys_message_notice
+    - sys_upload_files
+    - sys_notice_user
+    - ins_business_insurance
+    - ins_business_insurance_option
+    - ptl_scheme_insurance_driving_intention
+    - ptl_scheme_info
+    - ptl_scheme
+    - sys_activity