diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
index 45d42f98..03bb4422 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
@@ -142,9 +142,62 @@
     </select>
     <!--    多条件查询-->
     <select id="queryAll" parameterType="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan" resultMap="BaseInfoMapList">
-        select <include refid="BaseInfoList"></include> from es_revise_plan
-        <include refid="Conditions">
-        </include>
+        select
+        id,
+        es_name,
+        plan_status,
+        revise_status,
+        drafter,
+        res_person,
+        wg_leader,
+        draft_time,
+        release_time,
+        unit,
+        rqb_json as rqbJson,
+        ts_json as tsJson,
+        area,
+        qblb,
+        (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
+        (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName,
+        (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName,
+        (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName,
+        (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName
+        from es_revise_plan
+        <where>
+            <if test="esName != null and esName != ''">
+                and es_name like concat('%',#{esName},'%')
+            </if>
+            <if test="area != null and area != ''">
+                and area = #{area}
+            </if>
+            <if test="qblb != null and qblb != ''">
+                and qblb = #{qblb}
+            </if>
+            <if test="planStatus != null and planStatus != ''">
+                and plan_status = #{planStatus}
+            </if>
+            <if test="reviseStatus != null and reviseStatus != ''">
+                and revise_status = #{reviseStatus}
+            </if>
+            <if test="drafter != null and drafter != ''">
+                and drafter = #{drafter}
+            </if>
+            <if test="resPerson != null and resPerson != ''">
+                and res_person = #{resPerson}
+            </if>
+            <if test="wgLeader != null and wgLeader != ''">
+                and wg_leader = #{wgLeader}
+            </if>
+            <if test="draftTime != null">
+                and DATE_FORMAT(draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d')
+            </if>
+            <if test="releaseTime != null">
+                and DATE_FORMAT(release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d')
+            </if>
+            <if test="unit != null and unit != ''">
+                and (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) like concat('%',#{unit},'%')
+            </if>
+        </where>
         <include refid="pages">
         </include>
     </select>