From 91d531e4ed87a9ac760708ba8549968ba709add5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Mon, 5 Aug 2024 18:28:44 +0800
Subject: [PATCH] fix:88079

---
 .../ni/mapper/xml/ProcessNewStandardImportMapper.xml      | 8 +++++---
 .../src/main/resources/application-dev-chery.yml          | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml
index df5404e7..e7453b37 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/mapper/xml/ProcessNewStandardImportMapper.xml
@@ -5,12 +5,14 @@
 <mapper namespace="com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper">
 
     <select id="getStandardNameById" resultType="com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport">
-        select standard_number,standard_name,substitute_standard_number,implementation_date from
-       (select id, standard_number,standard_name,substitute_standard_number,implementation_date
+        select standard_number,standard_name,
+        (select GROUP_CONCAT(replaced SEPARATOR ', ') from laws_replaced_standard where type=1 and replaced_by = a.standard_number) as substitute_standard_number,
+        implementation_date from
+       (select id, standard_number,standard_name,implementation_date
        from laws_domestic_standard
        where del_flag = 0
        union all
-       select id, standard_number,standard_name,substitute_standard_number,implementation_date
+       select id, standard_number,standard_name,implementation_date
        from laws_enterprise_standard
        where del_flag = 0) a where id = #{id}
     </select>
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 826101d0..c8a9e58f 100644
--- a/laws-single-startup/src/main/resources/application-dev-chery.yml
+++ b/laws-single-startup/src/main/resources/application-dev-chery.yml
@@ -421,7 +421,7 @@ oauth:
   # 客户端应用注册ID--客户申请的：CGRSM
   clientId: CGRSM
   # 客户端应用注册密钥  客户申请的：58a1001438de462193bec307826463c2
-  clientSecret: 58a1001438de462193bec307826463c2
+  clientSecret: a0792bc797794ff89e5628498cce0912
   # 授权码验证
   grantType: authorization_code
   # 通过授权码获取accessToken请求地址