diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
index 841d45a..6f6ef8f 100644
--- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
+++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
@@ -25,37 +25,58 @@ import org.apache.ibatis.annotations.*;
  */
 @Mapper
 public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> {
-    @Select("select     m.*," +
-            "            t.ID_ AS task_id," +
-            "            t.NAME_ AS task_name," +
-            "            pd.NAME_ AS process_definition_name," +
-            "            t.START_TIME_ ," +
-            "            t.END_TIME_ ," +
-            "            pd.KEY_ " +
-            "        FROM act_hi_taskinst t" +
-            "        LEFT JOIN act_re_procdef pd ON t.PROC_DEF_ID_ = pd.ID_" +
-            "        LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id" +
-            "        WHERE 1=1" +
-            "        AND t.END_TIME_ IS NOT NULL " +
-            "        <if test='query.userId != null'>AND t.ASSIGNEE_ = #{query.userId}</if> "+
-            "        <if test='query.key != null'>AND pd.KEY_ = #{query.key}</if> "+
-            "        AND m.deleted = 0"+
-            "        <if test='query.startTime != null'> " +
-            "          AND t.START_TIME_ >= #{query.startTime} " +
-            "        </if> " +
-            "        <if test='query.endTime != null'> " +
-            "          AND t.END_TIME_ <= #{query.endTime} " +
-            "        </if> " +
-            "        <if test='query.busiLine != null'>AND m.busi_line = #{query.busiLine}</if> "+
-            "        <if test='query.orderNo != null and query.orderNo != '''>AND m.order_no LIKE CONCAT('%', #{query.orderNo}, '%')</if> "+
-            "        <if test='query.orderName != null and query.orderName != '''>AND m.order_name LIKE CONCAT('%', #{query.orderName}, '%')</if> "+
-            "        <if test='query.remark != null and query.remark != '''>AND m.remark LIKE CONCAT('%', #{query.remark}, '%')</if> "+
-            "        <if test='query.roadName != null and query.roadName != '''>AND m.road_name LIKE CONCAT('%', #{query.roadName}, '%')</if> "+
-            "        <if test='query.streetName != null'>AND m.order_no = #{query.orderNo}</if> "+
-            "        <if test='query.curingLevelId != null'>AND m.curing_level_id = #{query.curingLevelId}</if> "+
-            "        ORDER BY t.END_TIME_ desc "
-
-    )
+    @Select({
+            "<script>",
+            "SELECT",
+            "    m.*,",
+            "    t.ID_ AS task_id,",
+            "    t.NAME_ AS task_name,",
+            "    pd.NAME_ AS process_definition_name,",
+            "    t.START_TIME_,",
+            "    t.END_TIME_,",
+            "    pd.KEY_",
+            "FROM act_hi_taskinst t",
+            "LEFT JOIN act_re_procdef pd ON t.PROC_DEF_ID_ = pd.ID_",
+            "LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id AND m.deleted = 0",
+            "WHERE 1=1",
+            "  AND t.END_TIME_ IS NOT NULL",
+            "  <if test='query.userId != null'>",
+            "    AND t.ASSIGNEE_ = #{query.userId}",
+            "  </if>",
+            "  <if test='query.key != null'>",
+            "    AND pd.KEY_ = #{query.key}",
+            "  </if>",
+            "  <if test='query.startTime != null'>",
+            "    <![CDATA[ AND t.START_TIME_ >= #{query.startTime} ]]>",
+            "  </if>",
+            "  <if test='query.endTime != null'>",
+            "    <![CDATA[ AND t.END_TIME_ <= #{query.endTime} ]]>",
+            "  </if>",
+            "  <if test='query.busiLine != null'>",
+            "    AND m.busi_line = #{query.busiLine}",
+            "  </if>",
+            "  <if test=\"query.orderNo != null and query.orderNo != ''\">",
+            "    AND m.order_no LIKE CONCAT('%', #{query.orderNo}, '%')",
+            "  </if>",
+            "  <if test=\"query.orderName != null and query.orderName != ''\">",
+            "    AND m.order_name LIKE CONCAT('%', #{query.orderName}, '%')",
+            "  </if>",
+            "  <if test=\"query.remark != null and query.remark != ''\">",
+            "    AND m.remark LIKE CONCAT('%', #{query.remark}, '%')",
+            "  </if>",
+            "  <if test=\"query.roadName != null and query.roadName != ''\">",
+            "    AND m.road_name LIKE CONCAT('%', #{query.roadName}, '%')",
+            "  </if>",
+            "  <if test=\"query.streetName != null and query.streetName != ''\">",
+            "    AND m.street_name = #{query.streetName}",
+            "    <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->",
+            "  </if>",
+            "  <if test='query.curingLevelId != null'>",
+            "    AND m.curing_level_id = #{query.curingLevelId}",
+            "  </if>",
+            "ORDER BY t.END_TIME_ DESC",
+            "</script>"
+    })
     @Results({
             @Result(column = "id", property = "id"),
             @Result(column = "busi_line", property = "busiLine"),
@@ -107,35 +128,55 @@ public interface MainInfoExtMapper extends BaseMapperX<MainInfoDO> {
         return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
     }
 
-    @Select("select     m.*," +
-            "            t.ID_ AS task_id," +
-            "            t.NAME_ AS task_name," +
-            "            pd.NAME_ AS process_definition_name," +
-            "            t.CREATE_TIME_ as START_TIME_," +
-            "            t.DUE_DATE_ as END_TIME_," +
-            "            pd.KEY_ " +
-            "        FROM act_ru_task t" +
-            "        LEFT JOIN act_re_procdef pd ON t.PROC_DEF_ID_ = pd.ID_" +
-            "        LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id" +
-            "        WHERE 1=1" +
-            "        AND t.END_TIME_ IS NOT NULL " +
-            "        <if test='query.userId != null'>AND t.ASSIGNEE_ = #{query.userId}</if> "+
-            "        <if test='query.key != null'>AND pd.KEY_ = #{query.key}</if> "+
-            "        AND t.SUSPENSION_STATE_ = 1 "+
-            "        AND m.deleted = 0"+
-            "        <if test='query.startTime != null'> " +
-            "          AND t.CREATE_TIME_ >= #{query.startTime} " +
-            "        </if> " +
-            "        <if test='query.busiLine != null'>AND m.busi_line = #{query.busiLine}</if> "+
-            "        <if test='query.orderNo != null and query.orderNo != '''>AND m.order_no LIKE CONCAT('%', #{query.orderNo}, '%')</if> "+
-            "        <if test='query.orderName != null and query.orderName != '''>AND m.order_name LIKE CONCAT('%', #{query.orderName}, '%')</if> "+
-            "        <if test='query.remark != null and query.remark != '''>AND m.remark LIKE CONCAT('%', #{query.remark}, '%')</if> "+
-            "        <if test='query.roadName != null and query.roadName != '''>AND m.road_name LIKE CONCAT('%', #{query.roadName}, '%')</if> "+
-            "        <if test='query.streetName != null'>AND m.order_no = #{query.orderNo}</if> "+
-            "        <if test='query.curingLevelId != null'>AND m.curing_level_id = #{query.curingLevelId}</if> "+
-            "        ORDER BY t.CREATE_TIME_ desc "
-
-    )
+    @Select({
+            "<script>",
+            "SELECT",
+            "    m.*,",
+            "    t.ID_ AS task_id,",
+            "    t.NAME_ AS task_name,",
+            "    pd.NAME_ AS process_definition_name,",
+            "    t.CREATE_TIME_ AS START_TIME_,",
+            "    t.DUE_DATE_ AS END_TIME_,",
+            "    pd.KEY_",
+            "FROM act_ru_task t",
+            "LEFT JOIN act_re_procdef pd ON t.PROC_DEF_ID_ = pd.ID_",
+            "LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id AND m.deleted = 0",
+            "WHERE 1=1",
+            "  AND t.SUSPENSION_STATE_ = 1",
+            "  <if test='query.userId != null'>",
+            "    AND t.ASSIGNEE_ = #{query.userId}",
+            "  </if>",
+            "  <if test='query.key != null'>",
+            "    AND pd.KEY_ = #{query.key}",
+            "  </if>",
+            "  <if test='query.startTime != null'>",
+            "    <![CDATA[ AND t.CREATE_TIME_ >= #{query.startTime} ]]>",
+            "  </if>",
+            "  <if test='query.busiLine != null'>",
+            "    AND m.busi_line = #{query.busiLine}",
+            "  </if>",
+            "  <if test=\"query.orderNo != null and query.orderNo != ''\">",
+            "    AND m.order_no LIKE CONCAT('%', #{query.orderNo}, '%')",
+            "  </if>",
+            "  <if test=\"query.orderName != null and query.orderName != ''\">",
+            "    AND m.order_name LIKE CONCAT('%', #{query.orderName}, '%')",
+            "  </if>",
+            "  <if test=\"query.remark != null and query.remark != ''\">",
+            "    AND m.remark LIKE CONCAT('%', #{query.remark}, '%')",
+            "  </if>",
+            "  <if test=\"query.roadName != null and query.roadName != ''\">",
+            "    AND m.road_name LIKE CONCAT('%', #{query.roadName}, '%')",
+            "  </if>",
+            "  <if test=\"query.streetName != null and query.streetName != ''\">",
+            "    AND m.street_name = #{query.streetName}",
+            "    <!-- 若需模糊匹配，改为：AND m.street_name LIKE CONCAT('%', #{query.streetName}, '%') -->",
+            "  </if>",
+            "  <if test='query.curingLevelId != null'>",
+            "    AND m.curing_level_id = #{query.curingLevelId}",
+            "  </if>",
+            "ORDER BY t.CREATE_TIME_ DESC",
+            "</script>"
+    })
     @Results({
             @Result(column = "id", property = "id"),
             @Result(column = "busi_line", property = "busiLine"),