diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java
index b1f97419..853ceec1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/entity/SarLawsAttrInfo.java
@@ -88,11 +88,11 @@ public class SarLawsAttrInfo extends BaseEntity {
     @TableField("TGDWLAWS")
     private String tgdwlaws;
 
-    @TableField("NYLXLAWS")
-    private String nylxlaws;
-
-    @TableField("YYRZLAWS")
-    private String yyrzlaws;
+//    @TableField("NYLXLAWS")
+//    private String nylxlaws;
+//
+//    @TableField("YYRZLAWS")
+//    private String yyrzlaws;
 
     @TableField("ZRBMLAWS")
     private String zrbmlaws;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java
index d61e8da5..4420065b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java
@@ -77,9 +77,12 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
                 case "issueTime":
                     page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
                     break;
-                case "SSRQ":
+                case "SSRQLAWS":
                     page.setOrderByA("SSRQLAWS");
                     break;
+                case "LAWSSYCX":
+                    page.setOrderByA("LAWS_SYCX");
+                    break;
                 case "standStatusShow":
                     page.setOrderByA("standStatusShow");//文本状态
                     break;
@@ -145,7 +148,7 @@ public class SarLawsStandInfoController extends BaseController<SarLawsStandInfo>
             case "issueTime":
                 page.setOrderByA("SAR_LAWS_STAND_INFO.ISSUE_TIME");//发布日期
                 break;
-            case "SSRQ":
+            case "SSRQLAWS":
                 page.setOrderByA("SSRQLAWS");//实施日期
                 break;
             case "standStatusShow":
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java
index dc5f3dcd..21eabb73 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java
@@ -34,6 +34,18 @@ public class SarLawsStandInfoPage extends BasePage {
     @ApiModelProperty(value = "政策分类 共四级，逐级选择-配置管理中维护")
     private String lawsType;
 
+    @ApiModelProperty(value = "一级政策分类")
+    private String lawsTypeFirstLevel;
+
+    @ApiModelProperty(value = "二级政策份分类")
+    private String lawsTypeSecondLevel;
+
+    @ApiModelProperty(value = "三级政策分类")
+    private String lawsTypeThirdLevel;
+
+    @ApiModelProperty(value = "四级政策分类")
+    private String lawsTypeFourthLevel;
+
     @ApiModelProperty(value = "政策编号")
     private String lawsNumber;
 
@@ -70,6 +82,8 @@ public class SarLawsStandInfoPage extends BasePage {
     @ApiModelProperty(value = "适用车型-配置管理中维护")
     private String lawsSycx;
 
+    private String[] lawsSycxArray;
+
     @ApiModelProperty(value = "是/否（选择否，只有政策、政策中文名称是必填项目）")
     private String isRelateAccess;
 
@@ -231,8 +245,10 @@ public class SarLawsStandInfoPage extends BasePage {
     private String XCSJBUSS;
 
     private String SSRQLAWS;
+    private String XRZSSRQLAWS;
     private String XCXSSRQLAWS;
     private String ZCXSSRQLAWS;
+    private String SXRQLAWS;
     private String ZCWBLAWS;
     private String GCWBLAWS;
     private String JDWJLAWS;
@@ -240,6 +256,7 @@ public class SarLawsStandInfoPage extends BasePage {
     private String CYSDLAWS;
     private String TGRLAWS;
     private String TGDWLAWS;
+    private String SYRZLAWS;
     private String NYLXLAWS;
     private String YYRZLAWS;
     private String ZRBMLAWS;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
index 4f9bd2e4..767f5ade 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
@@ -170,6 +170,10 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
                 }
             }
         }
+        // 查询的使适用车型是多选
+        if (StringUtils.isNotBlank(page.getLawsSycx())) {
+            page.setLawsSycxArray(page.getLawsSycx().split(","));
+        }
         Integer rowCount = this.baseMapper.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
         List<SarLawsStandInfo> rows = this.baseMapper.getSarStandardsInfoPage(page);
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 d62daefb..51c316a5 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
@@ -91,8 +91,17 @@
             <if test='syncParam != null and syncParam == "sync"'>
                 and SAR_LAWS_STAND_INFO.MODIFY_TIME between DATE_SUB(NOW(),INTERVAL 7 day) and DATE_SUB(NOW(),INTERVAL -1 day)
             </if>
-            <if test="lawsType != null and lawsType != ''">
-                and SAR_LAWS_STAND_INFO.LAWS_TYPE like concat(concat('%',#{lawsType}),'%')
+            <if test="lawsTypeFirstLevel != null and lawsTypeFirstLevel != ''">
+                and SAR_LAWS_STAND_INFO.LAWS_TYPE_FIRST_LEVEL = #{lawsTypeFirstLevel}
+            </if>
+            <if test="lawsTypeSecondLevel != null and lawsTypeSecondLevel != ''">
+                and SAR_LAWS_STAND_INFO.LAWS_TYPE_SECOND_LEVEL = #{lawsTypeSecondLevel}
+            </if>
+            <if test="lawsTypeThirdLevel != null and lawsTypeThirdLevel != ''">
+                and SAR_LAWS_STAND_INFO.LAWS_TYPE_THIRD_LEVEL = #{lawsTypeThirdLevel}
+            </if>
+            <if test="lawsTypeFourthLevel != null and lawsTypeFourthLevel != ''">
+                and SAR_LAWS_STAND_INFO.LAWS_TYPE_FOURTH_LEVEL = #{lawsTypeFourthLevel}
             </if>
             <if test="lawsNumber != null and lawsNumber != ''">
                 and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%')
@@ -129,8 +138,12 @@
             <if test="lawsSyqy != null and lawsSyqy != ''">
                 and FIND_IN_SET(#{lawsSyqy},SAR_LAWS_STAND_INFO.LAWS_SYQY)
             </if>
-            <if test="lawsSycx != null and lawsSycx != ''">
-                and FIND_IN_SET(#{lawsSycx},SAR_LAWS_STAND_INFO.LAWS_SYCX)
+            <if test="lawsSycxArray != null and lawsSycxArray.length > 0">
+            and (
+                <foreach collection="lawsSycxArray" item="eachSycx" separator="or">
+                     FIND_IN_SET(#{eachSycx},SAR_LAWS_STAND_INFO.LAWS_SYCX)
+                </foreach>
+                )
             </if>
             <if test="isRelateAccess != null and isRelateAccess != ''">
                 and SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS = #{isRelateAccess}
@@ -189,6 +202,57 @@
             <if test="advanceSearchStr != null and advanceSearchStr != ''">
                 and (${advanceSearchStr})
             </if>
+            <if test="SSRQLAWS != null and SSRQLAWS != ''">
+                and DATE_FORMAT(SAR_LAWS_ATTR_INFO.SSRQLAWS  ,'%Y-%m-%d') = DATE_FORMAT(#{SSRQLAWS},'%Y-%m-%d')
+            </if>
+            <if test="XCXSSRQLAWS != null and XCXSSRQLAWS != ''">
+                and DATE_FORMAT(SAR_LAWS_ATTR_INFO.XCXSSRQLAWS  ,'%Y-%m-%d') = DATE_FORMAT(#{XCXSSRQLAWS},'%Y-%m-%d')
+            </if>
+            <if test="ZCXSSRQLAWS != null and ZCXSSRQLAWS != ''">
+                and DATE_FORMAT(SAR_LAWS_ATTR_INFO.ZCXSSRQLAWS  ,'%Y-%m-%d') = DATE_FORMAT(#{ZCXSSRQLAWS},'%Y-%m-%d')
+            </if>
+            <if test="XRZSSRQLAWS != null and XRZSSRQLAWS != ''">
+                and DATE_FORMAT(SAR_LAWS_ATTR_INFO.XRZSSRQLAWS  ,'%Y-%m-%d') = DATE_FORMAT(#{XRZSSRQLAWS},'%Y-%m-%d')
+            </if>
+            <if test="SXRQLAWS != null and SXRQLAWS != ''">
+                and DATE_FORMAT(SAR_LAWS_ATTR_INFO.SXRQLAWS  ,'%Y-%m-%d') = DATE_FORMAT(#{SXRQLAWS},'%Y-%m-%d')
+            </if>
+            <if test="CYSDLAWS != null and CYSDLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.CYSDLAWS = #{CYSDLAWS}
+            </if>
+            <if test="CYSDLAWS != null and CYSDLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.CYSDLAWS = #{CYSDLAWS}
+            </if>
+            <if test="TGRLAWS != null and TGRLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.TGRLAWS = #{TGRLAWS}
+            </if>
+            <if test="TGDWLAWS != null and TGDWLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.TGDWLAWS = #{TGDWLAWS}
+            </if>
+            <if test="SYRZLAWS != null and SYRZLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.SYRZLAWS = #{SYRZLAWS}
+            </if>
+            <if test="ZRBMLAWS != null and ZRBMLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.ZRBMLAWS = #{ZRBMLAWS}
+            </if>
+            <if test="ZRGCSLAWS != null and ZRGCSLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.ZRGCSLAWS = #{ZRGCSLAWS}
+            </if>
+            <if test="DTWJHLAWS != null and DTWJHLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.DTWJHLAWS = #{DTWJHLAWS}
+            </if>
+            <if test="BDTWJHLAWS != null and BDTWJHLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.BDTWJHLAWS = #{BDTWJHLAWS}
+            </if>
+            <if test="YYBZZCLAWS != null and YYBZZCLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.YYBZZCLAWS = #{YYBZZCLAWS}
+            </if>
+            <if test="XGLC != null and XGLC != ''">
+                and SAR_LAWS_ATTR_INFO.XGLC = #{XGLC}
+            </if>
+            <if test="CHJLLAWS != null and CHJLLAWS != ''">
+                and SAR_LAWS_ATTR_INFO.CHJLLAWS like concat(concat('%',#{CHJLLAWS}),'%')
+            </if>
         </trim>
     </sql>
     <sql id="SarStandardsInfo_in_left1">
@@ -516,8 +580,6 @@
         tmp_tb.CYSDLAWS,
         tmp_tb.TGRLAWS,
         tmp_tb.TGDWLAWS,
-        tmp_tb.NYLXLAWS,
-        tmp_tb.YYRZLAWS,
         tmp_tb.ZRBMLAWS,
         tmp_tb.ZRGCSLAWS,
         tmp_tb.DTWJHLAWS,