|
@@ -514,7 +514,7 @@ public class MeterTreeController extends BladeController {
|
|
|
" WHERE b.parent_id = a.id AND b.is_deleted = 0 AND b.status = 1 AND b.project_id = " + projectId + ") AS notExsitChild" +
|
|
|
" FROM s_meter_tree_project a WHERE a.project_id = " + projectId +
|
|
|
" AND a.is_deleted = 0 AND a.status = 1 AND a.parent_id = " + id +
|
|
|
- " ORDER BY a.sort,a.create_time",
|
|
|
+ " ORDER BY -a.sort desc,a.create_time",
|
|
|
new BeanPropertyRowMapper<>(MeterTreeProjectTreeVO.class));
|
|
|
return R.data(query);
|
|
|
}
|
|
@@ -739,7 +739,7 @@ public class MeterTreeController extends BladeController {
|
|
|
" WHERE c.is_deleted = 0 AND c.contract_meter_id = a.id) AS isDecompositionData" +
|
|
|
" FROM s_meter_tree_contract a WHERE a.contract_id = " + contractId +
|
|
|
" AND a.is_deleted = 0 AND a.status = 1 AND a.parent_id = " + id +
|
|
|
- " ORDER BY a.sort,a.create_time";
|
|
|
+ " ORDER BY -a.sort desc,a.create_time";
|
|
|
List<MeterTreeContractTreeVO> query = jdbcTemplate.query(sql,
|
|
|
new BeanPropertyRowMapper<>(MeterTreeContractTreeVO.class));
|
|
|
return R.data(query);
|