diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
index d2b7a5e..03ae9ed 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
@@ -122,17 +122,15 @@
     select DISTINCT b.id id,
     b.device_id deviceId,b.line_id lineId,b.code code,
     b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location,b.cl_did clDid
-    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 ">
+    <if test="csEventUserQueryPage!=null and (csEventUserQueryPage.type == 0 or csEventUserQueryPage.type == 1 )">
     ,d.name lineName
     </if>
     from  cs_event b
-    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 ">
-    inner join cs_equipment_delivery c on b.device_id=c.id inner join cs_line d on d.device_id=b.device_id and d.clDid=b.cl_did
+    <if test="csEventUserQueryPage!=null and (csEventUserQueryPage.type == 0 or csEventUserQueryPage.type == 1 )">
+    inner join  cs_line d on d.line_id=b.line_id
     </if>
     where 1=1
-    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 ">
-    and b.process=c.process
-    </if>
+
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.endTime  != null and csEventUserQueryPage.endTime !=''">
       AND DATE(b.start_time) &lt;= DATE(#{csEventUserQueryPage.endTime})
     </if>