From 103c4983ced0b5d58b84c220ec97867f2d29f524 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 01 一月 2026 15:22:49 +0800
Subject: [PATCH] 工作档空指针
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 5 ++++-
src/main/java/com/zy/asrs/controller/WrkMastController.java | 4 ++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 7a37f37..95477bf 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -56,6 +56,10 @@
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
+ // 璺宠繃绌哄�煎拰 "null" 瀛楃涓�
+ if (Cools.isEmpty(val) || "null".equals(val)) {
+ continue;
+ }
if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 1767d50..b594953 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -345,13 +345,16 @@
}
public String getCallAgv$() {
+ if (this.callAgv == null) {
+ return "";
+ }
switch (this.callAgv) {
case 0: return "鏈懠鍙�";
case 1: return "鍑嗗鍛煎彨";
case 2: return "宸插懠鍙�";
default:
+ return "";
}
- return "";
}
public String getWrkSts$() {
--
Gitblit v1.9.1