|
@@ -207,7 +207,8 @@
|
|
|
and b.end_mile <=#{endMile}
|
|
|
</if>
|
|
|
<if test="!dsFlay">
|
|
|
- and (
|
|
|
+ and
|
|
|
+ <trim prefix="(" prefixOverrides="or" suffix=")">
|
|
|
<if test="dsUserId != null and dsUserId != ''">
|
|
|
or a.create_by=#{dsUserId}
|
|
|
</if>
|
|
@@ -220,7 +221,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- )
|
|
|
+ </trim>
|
|
|
</if>
|
|
|
<if test="alarmType != null and alarmType != 0">
|
|
|
and a.alarm_type=#{alarmType}
|