diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml
index 14161174..a6934ea6 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml
@@ -66,17 +66,23 @@
${ew.sqlSegment} group by standard_class
union all
select 'dynamic_type' as field_name,dynamic_type,count(*) from
- (SELECT SUBSTRING_INDEX( SUBSTRING_INDEX( T1.dynamic_type, ',', T2.help_topic_id + 1 ), ',', - 1 ) AS dynamic_type ,standard_number,standard_name
- FROM laws_domestic_standard T1
- JOIN mysql.help_topic T2 ON T2.help_topic_id < ( LENGTH( T1.dynamic_type ) - LENGTH( REPLACE ( T1.dynamic_type, ',', '' )) + 1)
+ (
+ SELECT
+ SUBSTRING_INDEX(SUBSTRING_INDEX(dynamic_type, ',', numbers.n), ',', -1) dynamic_type,standard_number,standard_name
+ FROM laws_domestic_standard
+ JOIN(SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3) numbers
+ ON CHAR_LENGTH(dynamic_type)-CHAR_LENGTH(REPLACE(dynamic_type, ',', ''))>=numbers.n-1
${ew.sqlSegment}
) a
group by dynamic_type
union all
select 'applicable_vehicle_type' as field_name,applicable_vehicle,count(*) from
- (SELECT SUBSTRING_INDEX( SUBSTRING_INDEX( T1.applicable_vehicle, ',', T2.help_topic_id + 1 ), ',', - 1 ) AS applicable_vehicle ,standard_number,standard_name
- FROM laws_domestic_standard T1
- JOIN mysql.help_topic T2 ON T2.help_topic_id < ( LENGTH( T1.applicable_vehicle ) - LENGTH( REPLACE ( T1.applicable_vehicle, ',', '' )) + 1)
+ (
+ SELECT
+ SUBSTRING_INDEX(SUBSTRING_INDEX(applicable_vehicle, ',', numbers.n), ',', -1) applicable_vehicle,standard_number,standard_name
+ FROM laws_domestic_standard
+ JOIN (SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3) numbers
+ ON CHAR_LENGTH(applicable_vehicle)-CHAR_LENGTH(REPLACE(applicable_vehicle, ',', ''))>=numbers.n-1
${ew.sqlSegment}
) a
group by applicable_vehicle
@@ -95,9 +101,12 @@
${ew.sqlSegment} group by standard_class
union all
select 'applicable_vehicle' as field_name,applicable_vehicle,count(*) from
- (SELECT SUBSTRING_INDEX( SUBSTRING_INDEX( T1.applicable_vehicle, ',', T2.help_topic_id + 1 ), ',', - 1 ) AS applicable_vehicle ,standard_number,standard_name
- FROM laws_overseas_standard T1
- JOIN mysql.help_topic T2 ON T2.help_topic_id < ( LENGTH( T1.applicable_vehicle ) - LENGTH( REPLACE ( T1.applicable_vehicle, ',', '' )) + 1)
+ (
+ SELECT
+ SUBSTRING_INDEX(SUBSTRING_INDEX(applicable_vehicle, ',', numbers.n), ',', -1) applicable_vehicle,standard_number,standard_name
+ FROM laws_overseas_standard
+ JOIN (SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3) numbers
+ ON CHAR_LENGTH(applicable_vehicle)-CHAR_LENGTH(REPLACE(applicable_vehicle, ',', ''))>=numbers.n-1
${ew.sqlSegment}
) a
group by applicable_vehicle
diff --git a/laws-single-startup/src/main/resources/application-dev-chery.yml b/laws-single-startup/src/main/resources/application-dev-chery.yml
index 67bcbed9..acdf3b6e 100644
--- a/laws-single-startup/src/main/resources/application-dev-chery.yml
+++ b/laws-single-startup/src/main/resources/application-dev-chery.yml
@@ -380,6 +380,11 @@ iam:
bpmcAppkey: test
# 创建用户默认角色
defaultRoleIds: 817f7f818bb3506e018bb3506ef70000
+ # 对接验证参数
+ sm4:
+ key: JLB6L6MJVIT5Z7IL
+ type: SM4
+ signType: SM3
# Hiwork集成
hiwork:
diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml
index 9f62c85c..4bfd6178 100644
--- a/laws-single-startup/src/main/resources/application-test.yml
+++ b/laws-single-startup/src/main/resources/application-test.yml
@@ -380,6 +380,11 @@ iam:
bpmcAppkey: test
# 创建用户默认角色
defaultRoleIds: 817f7f818bb3506e018bb3506ef70000
+ # 对接验证参数
+ sm4:
+ key: JLB6L6MJVIT5Z7IL
+ type: SM4
+ signType: SM3
# Hiwork集成
hiwork: