From db18f06c49c3de52ae0863b7511dc429d64f02b9 Mon Sep 17 00:00:00 2001 From: huangge1199 Date: Mon, 11 Aug 2025 11:06:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=BA=93=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E2=80=9C=E8=8E=B7=E5=8F=96=E5=8E=9F=E5=AD=90=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E9=85=8D=E7=BD=AE(=E6=8C=87=E6=A0=87=E5=BA=93?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=82=B9=E5=87=BB=E8=A1=8D=E7=94=9F?= =?UTF-8?q?)=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/iet/ustb/sf/controller/TargetController.java | 3 +-- .../java/iet/ustb/sf/service/impl/TargetServiceImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/iet/ustb/sf/controller/TargetController.java b/src/main/java/iet/ustb/sf/controller/TargetController.java index fe65a14..692f595 100644 --- a/src/main/java/iet/ustb/sf/controller/TargetController.java +++ b/src/main/java/iet/ustb/sf/controller/TargetController.java @@ -100,8 +100,7 @@ public class TargetController { @Operation(summary = "获取原子指标配置(指标库列表中点击衍生)") @PostMapping("/getDetailExpandTarget") public R getDetailExpandTarget(@RequestBody JSONObject params) { - JSONObject result; - result = targetService.getDetailExpandTarget(params); + JSONObject result = targetService.getDetailExpandTarget(params); Page list = tableColumnService.getDataByTableName(result.getJSONObject("list")); result.put("list", list); result.put("columnList", tableColumnService.getColumnsByTableName(result.getString("tableName"))); diff --git a/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java b/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java index edaa0f8..0833616 100644 --- a/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java +++ b/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java @@ -456,9 +456,11 @@ public class TargetServiceImpl extends ServiceImpl CheckUtils.checkEmpty(id, "指标ID"); target = targetMapper.selectById(id); List optionList = new ArrayList<>(); - while (id != null) { + Target parent = targetMapper.selectById(id); + while (!StringUtils.isEmpty(id)) { optionList.addAll(0, targetOptionMapper.selectList(new QueryWrapper().eq("target_id", id))); - id = target.getParent(); + id = parent.getParent(); + parent = targetMapper.selectById(id); } return getDetailTarget(optionList, target); }