|
@ -75,7 +75,7 @@ |
|
|
AND b.sample_time <![CDATA[ <= ]]> #{sampleEndTime} |
|
|
AND b.sample_time <![CDATA[ <= ]]> #{sampleEndTime} |
|
|
</if> |
|
|
</if> |
|
|
<if test='null != isResiUser and "" != isResiUser'> |
|
|
<if test='null != isResiUser and "" != isResiUser'> |
|
|
AND b.is_resi_user = #{isResiUser} |
|
|
AND b.is_local_resi_user = #{isResiUser} |
|
|
</if> |
|
|
</if> |
|
|
ORDER BY b.nat_time DESC, b.id ASC |
|
|
ORDER BY b.nat_time DESC, b.id ASC |
|
|
</select> |
|
|
</select> |
|
|