From 24df6ba025b8c429210dd62d4d9b6bef7a583550 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 11 Nov 2021 13:05:39 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../SarLawsStandInfoMapper.xml                | 58 ++++++++++++++++---
 .../SarStandardsInfoMapper.xml                | 20 ++++++-
 2 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
index 8c479711..c175e355 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
@@ -235,14 +235,34 @@
     <select id="getSarStandardsInfoPage" resultMap="BaseResultMap"
             parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
         select
-        a.*,
-        dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
-        (
-        CASE
-        WHEN SAR_LAWS_ATTR_INFO.XCXSSRQLAWS ='' THEN '9999-01-01'
-        ELSE SAR_LAWS_ATTR_INFO.XCXSSRQLAWS
-        END
-        ) AS XCXSSRQLAWS
+            DISTINCT a.ID,
+            a.LAWS_TYPE,
+            a.LAWS_NUMBER,
+            a.LAWS_NAME,
+            a.LAWS_EN_NAME,
+            a.LAWS_NO,
+            a.ISSUE_TIME,
+            a.ISSUE_COMPANY,
+            a.COMMENT_CYCLE_START,
+            a.COMMENT_CYCLE_END,
+            a.LAWS_TEXT_STATE,
+            a.LAWS_SYQY,
+            a.LAWS_SYCX,
+            a.IS_RELATE_ACCESS,
+            a.LAWS_YEAR,
+            a.LAWS_NOTISYNC_NUM,
+            a.LAWS_BULLETIN,
+            a.LAWS_LABEL,
+            a.LAWS_REMARK,
+            a.COUNTRY,
+            a.MODIFY_TIME,
+            dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,
+            (
+            CASE
+            WHEN SAR_LAWS_ATTR_INFO.XCXSSRQLAWS ='' THEN '9999-01-01'
+            ELSE SAR_LAWS_ATTR_INFO.XCXSSRQLAWS
+            END
+            ) AS XCXSSRQLAWS
         from
         (select tmp_tb.*  from
         (
@@ -287,7 +307,27 @@
     <select id="getSarStandardsExportInfo" resultMap="BaseResultMapExcel"
             parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
         select
-            a.*,
+            DISTINCT a.ID,
+            a.LAWS_TYPE,
+            a.LAWS_NUMBER,
+            a.LAWS_NAME,
+            a.LAWS_EN_NAME,
+            a.LAWS_NO,
+            a.ISSUE_TIME,
+            a.ISSUE_COMPANY,
+            a.COMMENT_CYCLE_START,
+            a.COMMENT_CYCLE_END,
+            a.LAWS_TEXT_STATE,
+            a.LAWS_SYQY,
+            a.LAWS_SYCX,
+            a.IS_RELATE_ACCESS,
+            a.LAWS_YEAR,
+            a.LAWS_NOTISYNC_NUM,
+            a.LAWS_BULLETIN,
+            a.LAWS_LABEL,
+            a.LAWS_REMARK,
+            a.COUNTRY,
+            a.MODIFY_TIME,
         dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow
         from (select <include refid="Base_Column_List_Show"/>
         from SAR_LAWS_STAND_INFO
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 9d62f70d..c8ed2fa7 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -802,7 +802,25 @@
     <select id="getSarStandardsInfoPage" resultMap="BaseResultMap"
             parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage">
         select
-            a.*,
+            DISTINCT a.id,
+            a.stand_type,
+            a.country,
+            a.stand_sort,
+            a.stand_number,
+            a.stand_year,
+            a.stand_name,
+            a.stand_en_name,
+            a.stand_state,
+            a.stand_nature,
+            a.issue_time,
+            a.put_time,
+            a.text_status,
+            a.creation_user,
+            a.valid_flag,
+            a.creation_time,
+            a.modify_time,
+            a.STAND_SYSTEM,
+            a.IS_RELATE_ACCESS,
             SAR_STAND_ATTR_INFO.CHJL AS CHJL,
             dicstandSort.DIC_TYPE_NAME AS standSortShow,
             dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow,