diff --git a/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml b/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml
index 39946bb0..2595e0a6 100644
--- a/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml
@@ -29,10 +29,15 @@
 
     <select id="pageNotice" resultMap="BaseResultMap">
         <include refid="Base_SQL" />
-        and dbn.parent_server = #{map.parentServer}
+        <if test="map.parentServer != null and map.parentServer != ''">
+            and dbn.parent_server = #{map.parentServer}
+        </if>
         <if test="map.server != null and map.server != ''">
             and dbn.server = #{map.server}
         </if>
+        <if test="map.type != null and map.type != ''">
+            and dbn.type = #{map.type}
+        </if>
         <if test="map.status != null">
             and dbn.status = #{map.status}
         </if>
diff --git a/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
index 71a6d781..fcc531f2 100644
--- a/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
@@ -57,7 +57,7 @@
             <choose>
                 <when test="map.selectType == 'working'">
                     --    维修中的订单   --
-                and (drt.tickets_status = '04' OR drt.tickets_status = '05' )
+                and (drt.tickets_status = '04' OR drt.tickets_status = '05' OR drt.tickets_status = '05' OR drt.tickets_status ='01')
                 </when>
                 <when test="map.selectType == 'waitingPay'">
                     --    待支付的订单   --
diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
index 33f4a34c..6e8c2dd9 100644
--- a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
@@ -185,7 +185,7 @@
         -- 查待处理数据 --
         select drt.*
         from dl_repair_tickets drt
-        where (drt.deleted = '0') AND drt.tickets_status IN ('04','05','01')
+        where (drt.deleted = '0') AND drt.tickets_status IN ('04','05','01','07')
         <if test="map.ticketNo != null and map.ticketNo != ''">
             and (
             drt.ticket_no like concat('%', #{map.ticketNo}, '%')