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; }