Merge branch 'develop_master' into 'FOTON'

Develop master

See merge request LiuChao/foton-slrs-system-rest!330

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -34,6 +34,8 @@ public class ActDefineStartMap {
 
         // 企标制修订流程及企业标准库流程
         map.put("buss1","bussLibraryWkflow");
+        // 企标制修订-产品标准
+        map.put("buss2","bussLibraryProductWkflow");
 
         //张超然
         map.put("20","StandardApplyMeetProcess");

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml

@@ -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,