From 6af81ea2461ff8fe48320f4d33fe7b22c605254d Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 14 十二月 2023 18:56:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StatisticConfigServiceImpl.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StatisticConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StatisticConfigServiceImpl.java index 1168900..0c5c98c 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StatisticConfigServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StatisticConfigServiceImpl.java @@ -96,6 +96,7 @@ public R getBtmAndChartIds() { QueryWrapper<StatisticConfig> wrapper = new QueryWrapper<>(); wrapper.eq("user_id", AuthUtil.getUser().getUserId()); + wrapper.isNotNull("chart_ids"); List<StatisticConfig> list = this.list(wrapper); Map<String, String> collect = list.stream().collect(Collectors.toMap(StatisticConfig::getBtmname, StatisticConfig::getChartIds)); return R.data(collect); -- Gitblit v1.9.3