Merge branch 'refs/heads/dev_js_20260325'

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<String> 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<NewGrBiSaAggMonthCount> newGrBiSaAggList = newGrBiSaAggMonthCountService.selectNewGrBiSaAggGroupMonthList(params, groupFieldList);
                 PageInfo<NewGrBiSaAggMonthCount> pageInfo =  new PageInfo<>(newGrBiSaAggList);
                 List<Map<String, Object>> list = newGrBiSaAggList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList());