Merge branch 'feature_master_xh_standard' into 'master'

样本查询默认排序

See merge request !378
This commit is contained in:
2022-08-23 11:38:25 +08:00
@@ -649,7 +649,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
jsonList.add(temp);
}
if(StringUtils.isNotBlank(query.getSort())){
if(StringUtils.isNotBlank(query.getSortField())){
JSONObject jsonOrder = new JSONObject();
if(query.getOrder()){
jsonOrder.put("order", "asc");