|
|
@@ -411,9 +411,6 @@
|
|
|
and undo_time <= #{query.undoTimeRange[1]}
|
|
|
</if>
|
|
|
</if>
|
|
|
- <if test="query.deviceRunState != null">
|
|
|
- and run_state = #{query.deviceRunState}
|
|
|
- </if>
|
|
|
<if test="query.deviceType != null">
|
|
|
and type = #{query.deviceType}
|
|
|
</if>
|
|
|
@@ -449,6 +446,9 @@
|
|
|
<if test="query.warnFlow !=null">
|
|
|
and warn_flow= #{query.warnFlow}
|
|
|
</if>
|
|
|
+ <if test="query.deviceRunState != null">
|
|
|
+ and run_state = #{query.deviceRunState}
|
|
|
+ </if>
|
|
|
<if test="query.deviceAlarm != null">
|
|
|
and alarm_state = #{query.deviceAlarm}
|
|
|
</if>
|