From 97413a9725e1441f070edc139c1002954f1f50b7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 十一月 2025 11:28:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index 9049abc..481379d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -972,14 +972,14 @@
}
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
- String terminationVals= (String) dates.get("terminationVals");
- if ("null".equals(inputVal)) {
+ String terminationVals= dates.get("terminationVals").toString();;
+ if (inputVal==null) {
inputVal = "";
}
- if ("null".equals(project)) {
+ if (project==null) {
project = "";
}
- if ("null".equals(terminationVals)) {
+ if (terminationVals==null) {
terminationVals = "";
}
List<WorkInProgressDTO> dataList1 =reportMapper.exportWorkInProgressMp(process,inputVal,project,terminationVals);
@@ -1243,14 +1243,14 @@
}
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
- String terminationVals= (String) dates.get("terminationVals");
- if ("null".equals(inputVal)) {
+ String terminationVals= dates.get("terminationVals").toString();;
+ if (inputVal==null) {
inputVal = "";
}
- if ("null".equals(project)) {
+ if (project==null) {
project = "";
}
- if ("null".equals(terminationVals)) {
+ if (terminationVals==null) {
terminationVals = "";
}
--
Gitblit v1.8.0