bug

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

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/MeterTreeSystemTreeVO.java

@@ -10,4 +10,7 @@ public class MeterTreeSystemTreeVO extends MeterTreeSystem {
     @ApiModelProperty(value = "是否没有子级 true=最下级（没有子级） false=有子级")
     private boolean notExsitChild;
 
+    @ApiModelProperty(value = "节点类型名称")
+    private String nodeTypeName;
+
 }

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

@@ -290,13 +290,21 @@ public class MeterTreeController extends BladeController {
     @GetMapping("/system/child-list")
     @ApiOperationSupport(order = 12)
     @ApiOperation(value = "系统树节点下级节点列表", notes = "传入id")
-    public R<List<MeterTreeSystem>> systemChildList(@RequestParam String id) {
+    public R<List<MeterTreeSystemTreeVO>> systemChildList(@RequestParam String id) {
         if (StringUtils.isNotEmpty(id)) {
-            return R.data(meterTreeSystemService.getBaseMapper().selectList(Wrappers.<MeterTreeSystem>lambdaQuery()
+            List<MeterTreeSystem> meterTreeSystems = meterTreeSystemService.getBaseMapper().selectList(Wrappers.<MeterTreeSystem>lambdaQuery()
                     .like(MeterTreeSystem::getAncestor, id)
                     .eq(MeterTreeSystem::getStatus, 1)
                     .orderByAsc(MeterTreeSystem::getCreateTime)
-                    .orderByAsc(MeterTreeSystem::getSort)));
+                    .orderByAsc(MeterTreeSystem::getSort));
+            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) {
+                if (ObjectUtil.isNotEmpty(vo.getNodeType())) {
+                    vo.setNodeTypeName(dictMap.getOrDefault(vo.getNodeType() + "", null));
+                }
+            }
+            return R.data(VOS);
         }
         return R.data(null);
     }
@@ -779,7 +787,7 @@ public class MeterTreeController extends BladeController {
     @GetMapping("/getNodeTypeList")
     @ApiOperationSupport(order = 31)
     @ApiOperation(value = "系统、项目、合同段获取节点类型列表", notes = "")
-    public R<List<Dict>> getSystemOrProjectNodeTypeList() {
+    public R<List<Dict>> getNodeTypeList() {
         List<Dict> query = jdbcTemplate.query("SELECT dict_value,dict_key FROM blade_dict WHERE is_deleted = 0 AND code = 'wbs_node_type' AND dict_key in(1,2,3,4,5,6)", new BeanPropertyRowMapper<>(Dict.class));
         return R.data(query);
     }
@@ -787,7 +795,7 @@ public class MeterTreeController extends BladeController {
     @GetMapping("/contract/update/getNodeTypeList")
     @ApiOperationSupport(order = 32)
     @ApiOperation(value = "合同段修改时获取下级节点类型列表", notes = "传入id")
-    public R<List<Dict>> getNodeTypeList(@RequestParam String id) {
+    public R<List<Dict>> getContractUpdateNodeTypeList(@RequestParam String id) {
         MeterTreeContract contractNode = meterTreeContractService.getById(id);
         if (contractNode != null && ObjectUtil.isNotEmpty(contractNode.getNodeType())) {
             Integer nodeType = contractNode.getNodeType();