From f3a7771d2e623e15b2dec6cd5e2254067eda86fd Mon Sep 17 00:00:00 2001 From: king Date: Thu, 26 Mar 2026 09:11:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E9=94=80=E5=94=AE=E6=83=85?= =?UTF-8?q?=E5=86=B5=E8=A1=A8=20sql=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/enhance/example/report/xtsy/zhxsqkPlugin.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java index 62560f7..98fa224 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/xtsy/zhxsqkPlugin.java @@ -52,8 +52,11 @@ public class zhxsqkPlugin implements ReportAroundAdvicePlugin { throw new lideeYunJiException("在选择维度时，“货品名称”不能有值！"); } List groupFieldList = Arrays.asList(params.get("Group by").toString().split(",")); + if(!groupFieldList.contains("useYear") && !params.containsKey("useYear")){ + throw new lideeYunJiException("维度“年” 和 查询条件“年” 不能同时为空！"); + } PageHelper.startPage(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString())); - if((groupFieldList.contains("useMonth") || params.containsKey("useMonth"))){ + if(groupFieldList.contains("useMonth") || params.containsKey("useMonth")){ List newGrBiSaAggList = newGrBiSaAggMonthCountService.selectNewGrBiSaAggGroupMonthList(params, groupFieldList); PageInfo pageInfo = new PageInfo<>(newGrBiSaAggList); List> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList());