From 2c10e50630f17009f7e8b8182442ab62c28abf94 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 13 Jan 2026 17:05:50 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=9C=8B=E6=9D=BF=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/controller/ProdReportController.java | 13 +++++++++++++ .../impl/SysDesignPageConfigServiceImpl.java | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java index b5cb1fd7..2d4a153c 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java @@ -273,4 +273,17 @@ public class ProdReportController extends BaseController { return R.ok(vos); } + /** + * 自定义接口 + */ + @GetMapping("/dashboard/custom") + public R> dashboardDataCustom(@RequestParam(required = false) Map params) { + // 参数校验 + if (params == null) { + params = new HashMap<>(); + } + Map result = params; + return R.ok(result); + } + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignPageConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignPageConfigServiceImpl.java index 69e302ef..2fc91154 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignPageConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDesignPageConfigServiceImpl.java @@ -50,9 +50,13 @@ public class SysDesignPageConfigServiceImpl implements ISysDesignPageConfigServi public SysDesignPageConfigVo queryById(Long pageConfigId) { SysDesignPageConfigVo designPageConfigVo = baseMapper.selectVoById(pageConfigId); List designPagePointList = getDesignPagePoints(pageConfigId); - designPageConfigVo.setDesignPagePointList(designPagePointList); + if (!designPagePointList.isEmpty()) { + designPageConfigVo.setDesignPagePointList(designPagePointList); + } List designPageEdgesList = getDesignPageEdges(pageConfigId); - designPageConfigVo.setDesignPageEdgesList(designPageEdgesList); + if (!designPageEdgesList.isEmpty()) { + designPageConfigVo.setDesignPageEdgesList(designPageEdgesList); + } return designPageConfigVo; }