|
|
@ -166,7 +166,6 @@ |
|
|
|
<if test="userId == null or userId.trim() == ''"> |
|
|
|
AND t1.STATE <![CDATA[ <> ]]> 20 |
|
|
|
AND t1.GROUP_ID = #{groupId} |
|
|
|
AND t1.GRID_ID = #{gridId} |
|
|
|
<if test="timestamp != null and timestamp.trim() != ''"> |
|
|
|
<![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp} |
|
|
|
</if> |
|
|
|