|
@@ -305,15 +305,15 @@
|
|
|
|
|
|
<where>
|
|
|
<if test="query.activeState != null and query.activeState != ''">
|
|
|
- active_state = #{query.activeState}
|
|
|
+ and active_state = #{query.activeState}
|
|
|
</if>
|
|
|
|
|
|
<if test="query.busyStatus != null ">
|
|
|
- busy_state = #{query.busyStatus}
|
|
|
+ and busy_state = #{query.busyStatus}
|
|
|
</if>
|
|
|
|
|
|
<if test="query.deviceType != null ">
|
|
|
- device_type = #{query.deviceType}
|
|
|
+ and device_type = #{query.deviceType}
|
|
|
</if>
|
|
|
|
|
|
<if test="query.mercId != null">
|