|
|
@@ -367,10 +367,10 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
</where>
|
|
|
- <if test="(pumpParam.sort != null and !pumpParam.sort) or pumpParam.sort == null">
|
|
|
- ORDER BY p.last_upload_time desc
|
|
|
+ <if test="pumpParam.sort != null and !pumpParam.sort ">
|
|
|
+ ORDER BY pi.bed_code asc
|
|
|
</if>
|
|
|
- <if test="pumpParam.sort != null and pumpParam.sort ">
|
|
|
+ <if test="(pumpParam.sort != null and pumpParam.sort) or pumpParam.sort == null">
|
|
|
ORDER BY p.last_upload_time desc
|
|
|
</if>
|
|
|
</select>
|