Merge branch 'develop_master' into 'FOTON'

Develop master See merge request LiuChao/foton-slrs-system-rest!330
2021-12-27 18:55:58 +08:00
parent ccfa63fc2a 94d5d2e128
commit 915fcac514
2 changed files with 5 additions and 3 deletions
@@ -3,7 +3,7 @@
 <mapper namespace="com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao">

    <select id="selectLawsById" parameterType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,b.SSRQ as SSRQ,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+        SELECT distinct a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,b.SSRQ as SSRQ,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
               b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow,
               a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType,a.TEXT_STATUS as textStatus
        FROM sar_standards_info a
@@ -47,7 +47,7 @@
        UNION ALL

        SELECT
-        a.ID,
+        distinct a.ID,
        a.STAND_CODE AS standNumber,
        a.STAND_NAME AS standName,
        a.STAND_EN_NAME,
@@ -86,7 +86,7 @@
        UNION ALL

        SELECT
-        a.ID,
+        distinct a.ID,
        a.LAWS_NUMBER AS standNumber,
        a.LAWS_NAME AS standName,
        a.LAWS_EN_NAME as STAND_EN_NAME,