bug

Signed-off-by: liuyc <56808083@qq.com>

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -161,7 +161,7 @@ public class MeterTreeController extends BladeController {
 
     @GetMapping("/system/getEngineeringTypeName")
     @ApiOperationSupport(order = 5)
-    @ApiOperation(value = "系统树节点新增获取工程类型名称", notes = "传入id")
+    @ApiOperation(value = "系统树节点新增获取工程类型名称", notes = "传入上级节点的id")
     public R<Object> getSystemEngineeringTypeName(@RequestParam String id) {
         MeterTreeSystem node = meterTreeSystemService.getById(id);
         if (node != null) {
@@ -280,7 +280,7 @@ public class MeterTreeController extends BladeController {
                             "   WHERE b.parent_id = a.id AND b.is_deleted = 0 AND b.status = 1 AND b.template_id = " + templateId + ") AS notExsitChild" +
                             " FROM s_meter_tree_system a WHERE a.template_id = " + templateId +
                             " AND a.is_deleted = 0 AND a.status = 1 AND a.parent_id = " + id +
-                            " ORDER BY a.sort",
+                            " ORDER BY a.sort,a.create_time",
                     new BeanPropertyRowMapper<>(MeterTreeSystemTreeVO.class));
             return R.data(query);
         }
@@ -292,11 +292,11 @@ public class MeterTreeController extends BladeController {
     @ApiOperation(value = "系统树节点下级节点列表", notes = "传入id")
     public R<List<MeterTreeSystemTreeVO>> systemChildList(@RequestParam String id) {
         if (StringUtils.isNotEmpty(id)) {
-            List<MeterTreeSystem> meterTreeSystems = meterTreeSystemService.getBaseMapper().selectList(Wrappers.<MeterTreeSystem>lambdaQuery()
-                    .like(MeterTreeSystem::getAncestor, id)
-                    .eq(MeterTreeSystem::getStatus, 1)
-                    .orderByAsc(MeterTreeSystem::getCreateTime)
-                    .orderByAsc(MeterTreeSystem::getSort));
+            List<MeterTreeSystem> meterTreeSystems = meterTreeSystemService.getBaseMapper()
+                    .selectList(Wrappers.<MeterTreeSystem>lambdaQuery()
+                            .eq(MeterTreeSystem::getParentId, id)
+                            .eq(MeterTreeSystem::getStatus, 1)
+                            .orderByAsc(Arrays.asList(MeterTreeSystem::getSort, MeterTreeSystem::getCreateTime)));
             List<MeterTreeSystemTreeVO> VOS = BeanUtil.copyProperties(meterTreeSystems, MeterTreeSystemTreeVO.class);
             Map<String, String> dictMap = this.getNodeTypeList().getData().stream().collect(Collectors.toMap(Dict::getDictKey, Dict::getDictValue));
             for (MeterTreeSystemTreeVO vo : VOS) {
@@ -370,7 +370,7 @@ public class MeterTreeController extends BladeController {
 
     @GetMapping("/project/getEngineeringTypeName")
     @ApiOperationSupport(order = 15)
-    @ApiOperation(value = "项目树节点新增获取工程类型名称", notes = "传入id")
+    @ApiOperation(value = "项目树节点新增获取工程类型名称", notes = "传入上级节点的id")
     public R<Object> getProjectEngineeringTypeName(@RequestParam String id) {
         MeterTreeProject node = meterTreeProjectService.getById(id);
         if (node != null) {
@@ -492,7 +492,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",
+                            " ORDER BY a.sort,a.create_time",
                     new BeanPropertyRowMapper<>(MeterTreeProjectTreeVO.class));
             return R.data(query);
         }
@@ -621,7 +621,7 @@ public class MeterTreeController extends BladeController {
 
     @GetMapping("/contract/getEngineeringTypeName")
     @ApiOperationSupport(order = 24)
-    @ApiOperation(value = "合同段节点新增获取工程类型名称", notes = "传入id")
+    @ApiOperation(value = "合同段节点新增获取工程类型名称", notes = "传入上级节点的id")
     public R<Object> getContractEngineeringTypeName(@RequestParam String id) {
         MeterTreeContract node = meterTreeContractService.getById(id);
         if (node != null) {
@@ -685,7 +685,7 @@ public class MeterTreeController extends BladeController {
                             "   WHERE b.parent_id = a.id AND b.is_deleted = 0 AND b.status = 1 AND b.contract_id = " + contractId + ") AS notExsitChild" +
                             " 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",
+                            " ORDER BY a.sort,a.create_time",
                     new BeanPropertyRowMapper<>(MeterTreeContractTreeVO.class));
             return R.data(query);
         }