From 1c285b38777e9f37ee8d112e994443d3640b78c1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 三月 2024 13:47:07 +0800
Subject: [PATCH] 解决查询出错
---
src/main/java/com/lf/server/service/sys/ReportService.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/lf/server/service/sys/ReportService.java b/src/main/java/com/lf/server/service/sys/ReportService.java
index a870950..722803c 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -251,7 +251,7 @@
@Override
public List<CountEntity> countVariousDataByPrj(String code) {
- code = StringHelper.getRightLike(code);
+ code = StringUtils.isEmpty(code) || "ALL".equals(code) ? null : StringHelper.getRightLike(code);
return reportMapper.countVariousDataByPrj(code);
}
@@ -354,7 +354,7 @@
Map<String, String> textMap = new HashMap<>();
if (!StringHelper.isEmpty(code)) {
- textMap.put("title", dirService.selectNameByCode(code));
+ textMap.put("title", "ALL".equals(code) ? "鎵�鏈夐」鐩�" : dirService.selectNameByCode(code));
list.remove(list.size() - 1);
}
@@ -408,10 +408,8 @@
Map<String, Object> map = new HashMap<>();
if (!StringHelper.isEmpty(code)) {
- map.put("title", dirService.selectNameByCode(code));
+ map.put("title", "ALL".equals(code) ? "鎵�鏈夐」鐩�" : dirService.selectNameByCode(code));
list.remove(list.size() - 1);
- }
- if (null != code) {
for (CountEntity ce : list) {
ce.setM2("count".equals(ce.getM2()) ? ce.getCount() + "涓�" : ("area".equals(ce.getM2()) ? ce.getM3() : ce.getLen() + "鍗冪背"));
}
--
Gitblit v1.9.3