Merge remote-tracking branch 'origin/master'

gateway/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 spring:
   minio:
-    url: http://192.168.5.250:9000
+    url: http://192.168.0.250:9000
     access-key: v7Zb8XhyLcYNcSHlxvyK
     secret-key: 58YibMwpxGKtXcekPL065OM4GonC1hf2tFMjI9EN
     bucket-name: jzg
@@ -13,10 +13,10 @@ spring:
         import-check:
           enabled: false
         file-extension: yaml
-        namespace: 9fceaca4-c1d2-4bb8-aac9-f64d4b7de73c
+        namespace: e8df500e-697c-46af-ae25-0c02f4fe146d
         group: DEFAULT_GROUP
       discovery:
-        namespace: 9fceaca4-c1d2-4bb8-aac9-f64d4b7de73c
+        namespace: e8df500e-697c-46af-ae25-0c02f4fe146d
 
     gateway:
       routes:
@@ -95,6 +95,8 @@ spring:
                   - /accountCard/**
                   - /amountAuditing/**
                   - /newCarJudgeRules/**
+                  - /sysDistributionSetting/**
+                  - /organization/wechat/**
 
         - id: summary_route
           uri: http://localhost:9898/

partner/src/main/resources/application.yml

@@ -31,6 +31,7 @@ tenant:
     - cte_name
     - target_user
     - sys_user_jzg_info_salesman
+    - sub_partners
 
   ignoreFunction:
     - /partner/isTherePartner

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

@@ -65,27 +65,7 @@ tenant:
 
 data-scope:
   tables:
-    - 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
-    - ptl_agreement_undwrt_rules_attr
-    - ptl_agreement_undwrt_rules_dict_labal
-    - jyx_config
-    - jyx_setting
-    - ptl_area_license
-    - esm_ins_company
+
 logging:
   level:
     org.springframework.statemachine: DEBUG

tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -61,7 +61,7 @@
         suji.name,
         suji.dept_id,
         sd.name as dept_name,
-        suji.type_attr,
+        (SELECT GROUP_CONCAT( s.type_attr SEPARATOR ',' ) FROM sys_user_jzg_info_salesman s WHERE s.sys_user_jzg_info_id = suji.id ) AS type_attr,
         suji.status,
         suji.is_enable,
         suji.leader_id,