Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -1118,7 +1118,7 @@
             <if test="page.applyArctic != null and page.applyArctic != ''">
                 and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
             </if>
-            <if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
+            <if test="null != page.advanceSearchStr  and page.advanceSearchStr != ''">
                 and (${page.advanceSearchStr})
             </if>
         </trim>
@@ -1490,16 +1490,16 @@
         FROM sar_standards_info
         LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID
         WHERE
-        DATE_FORMAT(ssai.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(
+        DATE_FORMAT( LEFT (ssai.SSRQ,10), '%Y-%m-%d') >= DATE_FORMAT(
         SAR_STANDARDS_INFO.ISSUE_TIME,
         '%Y-%m-%d'
         )
         AND
         sar_standards_info.VALID_FLAG='0'
-        AND TEXT_STATUS=#{typeCode}
         ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC
         LIMIT #{limit}
     </select>
+    <!--AND TEXT_STATUS=#{typeCode}-->
 
     <!--    查询表中是否存在某字段-->
     <select id="selectStandColumn" resultType="java.lang.Integer" parameterType="java.lang.String">