diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java
index 6533651e..a3207127 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java
@@ -50,6 +50,10 @@ public class FileMaterial extends BaseEntity {
     @TableField("attach_file_id")
     private String attachFileId;
 
+    @ApiModelProperty(value = "资料说明")
+    @TableField("data_explain")
+    private String  dataExplain;
+
 
     @ApiModelProperty(value = "点击量")
     @TableField("click_count")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java
index 670b4fc7..b8e69de7 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java
@@ -36,6 +36,8 @@ public class SarModelTree extends BaseEntity {
     @TableField("PID")
     private String pid;
 
+
+    @ApiModelProperty(value = "查询子节点时,使用model与结果对比,筛选出与父节点不同的数据")
     @TableField("MODEL")
     private String model;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
index fafcea69..0b9dfd4b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
@@ -23,7 +23,7 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
 
     List<SarStandardsInfo> getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark);
 
-    int getSarStandardsInfoCount(SarStandardsInfoEOPage page);
+    int getSarStandardsInfoCount(@Param("page") SarStandardsInfoEOPage page);
 
     int getSarStandardsInfoCountWk1(SarStandardsInfoEOPage page);
 
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 062c1cba..478171c9 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
@@ -886,67 +886,76 @@
 
     <sql id="SarStandardsInfo_in_left">
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
+        left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
+        dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
+        AND dicstandTextStatus.dic_id IS NOT NULL
+        AND dicstandTextStatus.valid_flag = 0
+        )
+        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
         where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
         <trim suffixOverrides=",">
             <!-- 标准分类 国内标准，国外标准  必要搜索项                 -->
-            <if test='standType != null and standType != "ALL"'>
-                and stand_type = #{standType}
+            <if test='page.standType != null and page.standType != "ALL"'>
+                and stand_type = #{page.standType}
             </if>
             <!--                     基本搜索项                         -->
             <!-- 国家、地区 -->
-            <if test="country != null and country != ''">
-                and country = #{country}
+            <if test="page.country != null and page.country != ''">
+                and country = #{page.country}
             </if>
             <!-- 标准编号111 -->
-            <if test="standNumber != null and standNumber != ''">
+            <if test="page.standNumber != null and page.standNumber != ''">
                 and (
                 (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-                SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),
-                ' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
-                or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like
-                trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
-                )
+                SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                <!--  and SAR_STANDARDS_INFO.STAND_YEAR = ''-->
+                <!--    or (stand_name like concat(concat('%',#{page.standNumber}),'%')) -->
                 )
             </if>
             <!-- 标准名称 -->
-            <if test="standName != null and standName != ''">
-                and stand_name like concat(concat('%',#{standName}),'%')
+            <if test="page.standName != null and page.standName != ''">
+                and stand_name like concat(concat('%',#{page.standName}),'%')
+                <!--  or STAND_NUMBER like concat(concat('%',#{page.standName}),'%') -->
+                <!--  or STAND_YEAR like concat(concat('%',#{page.standName}),'%') -->
+                <!--  or STAND_SORT like concat(concat('%',#{page.standName}),'%') -->
             </if>
-            <if test="standEnName != null and standEnName != ''">
-                and stand_en_name like concat(concat('%',#{standEnName}),'%')
+            <if test="page.standEnName != null and page.standEnName != ''">
+                and stand_en_name like concat(concat('%',#{page.standEnName}),'%')
             </if>
             <!-- 标准状态 -->
-            <if test="standState != null and standState != ''">
-                and stand_state = #{standState}
+            <if test="page.standState != null and page.standState != ''">
+                and stand_state = #{page.standState}
             </if>
             <!--                   高级检索项                          -->
             <!--  标准性质 -->
-            <if test="standNature != null and standNature != ''">
-                and stand_nature = #{standNature}
+            <if test="page.standNature != null and page.standNature != ''">
+                and stand_nature = #{page.standNature}
             </if>
             <!--  代替标准  允许输入的时候输入多个-->
-            <if test="replaceStandNum != null and replaceStandNum != ''">
-                and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%')
+            <if test="page.replaceStandNum != null and page.replaceStandNum != ''">
+                and SAR_STAND_ATTR_INFO.DTBJH like concat(concat('%',#{page.replaceStandNum}),'%')
             </if>
             <!--  被代替标准 -->
-            <if test="replacedStandNum != null and replacedStandNum != ''">
-                and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%')
+            <if test="page.replacedStandNum != null and page.replacedStandNum != ''">
+                and replaced_stand_num like concat(concat('%',#{page.replacedStandNum}),'%')
             </if>
-            <if test="isRelateAccess != null and isRelateAccess != ''" >
-                and is_relate_access = #{isRelateAccess}
+            <if test="page.isRelateAccess != null and page.isRelateAccess != ''" >
+                and is_relate_access = #{page.isRelateAccess}
             </if>
             <!--  目录判断 -->
-            <if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null">
+            <if test="page.menuId != null and page.menuId !='nomenu' and page.menuAllChildrenIdList != null">
                 and SAR_STAND_MENU.MENU_ID in
-                <foreach collection="menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
+                <foreach collection="page.menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
 
             </if>
             <!--  新修改需求，根据角色查询有权限的菜单数据-->
-            <if test="menuRoleList != null">
+            <if test="page.menuRoleList != null">
                 and SAR_STAND_MENU.MENU_ID in
-                <foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
+                <foreach collection="page.menuRoleList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
@@ -958,52 +967,68 @@
             <!--                )-->
             <!--            </if>-->
             <!-- 导出数据过程中，选择的id -->
-            <if test="idlist != null">
+            <if test="page.idlist != null">
                 and SAR_STANDARDS_INFO.id in
-                <foreach collection="idlist" index="index" item="item" open="(" separator="," close=")">
+                <foreach collection="page.idlist" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-            <if test="standSort != null and standSort != ''" >
-                and SAR_STANDARDS_INFO.stand_sort = #{standSort}
+            <if test="page.standSort != null and page.standSort != ''" >
+                and SAR_STANDARDS_INFO.stand_sort = #{page.standSort}
             </if>
             <!--标准年份-->
-            <if test="standYear != null and standYear != ''">
-                and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear}
+            <if test="page.standYear != null and page.standYear != ''">
+                and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear}
             </if>
-            <if test="issueTime != null and issueTime != ''">
-                and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d') = #{issueTime}
+            <!--             发布日期日期-->
+            <if test="page.issueTime != null and page.issueTime != ''">
+                and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d') = #{page.issueTime}
             </if>
-
-            <if test="startIssueTime != null and startIssueTime != '' and endIssueTime != null and endIssueTime != ''">
+            <!--            范围查询 发布日期日期-->
+            <if test="page.startIssueTime != null and page.startIssueTime != '' and page.endIssueTime != null and page.endIssueTime != ''">
                 and
                 DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME  ,'%Y-%m-%d')
                 between
-                DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d')
+                DATE_FORMAT(#{page.startIssueTime}  ,'%Y-%m-%d')
                 and
-                DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d')
+                DATE_FORMAT(#{page.endIssueTime}  ,'%Y-%m-%d')
             </if>
             <!--内容摘要-->
-            <if test="synopsis != null and synopsis != ''" >
-                AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0
+            <if test="page.synopsis != null and page.synopsis != ''" >
+                AND dbms_lob.instr(SYNOPSIS, #{page.synopsis} ,1,1) > 0
             </if>
 
             <!--文本状态-->
-            <if test="textStatus != null and textStatus != ''" >
-                and SAR_STANDARDS_INFO.TEXT_STATUS = #{textStatus}
+            <if test="page.textStatus != null and page.textStatus != ''" >
+                and SAR_STANDARDS_INFO.TEXT_STATUS = #{page.textStatus}
             </if>
             <!--是否纳入法规清单-->
-            <if test="isRelateAccess != null and isRelateAccess != ''" >
-                and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{isRelateAccess}
+            <if test="page.isRelateAccess != null and page.isRelateAccess != ''" >
+                and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{page.isRelateAccess}
             </if>
 
-            <if test="collectMenuId != null and collectMenuId != ''">
+            <if test="page.collectMenuId != null and page.collectMenuId != ''">
                 and SAR_STANDARDS_INFO.id in (
                 select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
                 and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
-                and TS_PERSON_COLLECT.user_id=#{userId}
+                and TS_PERSON_COLLECT.user_id=#{page.userId}
                 )
             </if>
+
+            <!-- out -->
+            <if test='page.labelMenuId != null and page.labelMenuId == "gxhbq"'>
+                and SAR_STAND_ATTR_INFO.GXHBQ is not null
+            </if>
+            <if test='page.labelMenuId != null and page.labelMenuId != "gxhbq"'>
+                and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%')
+            </if>
+            <!--适用车型-->
+            <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 != ''">
+                and (${page.advanceSearchStr})
+            </if>
         </trim>
     </sql>
 
@@ -1148,8 +1173,9 @@
     <select id="getSarStandardsInfoCount" resultType="java.lang.Integer"
             parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage">
         select count(1) from (select count(*) from SAR_STANDARDS_INFO
-        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
+        <!--       left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)-->
         <include refid="SarStandardsInfo_in_left"/>
+
         GROUP BY SAR_STANDARDS_INFO.id) a
     </select>