From 1c02f5b648cd3c58a7db7dcec761071d5daabb26 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 20 八月 2024 13:24:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java
index 2939aae..6b39ea5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
@@ -26,7 +26,6 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
@Data
@TableName("strategy_laneway_rule")
@@ -139,19 +138,25 @@
// );
public List<Integer> getLaneX$() {
- if (null == this.laneX){ return null; }
+ if (null == this.laneX){ return new ArrayList<>(); }
+ if (Cools.isEmpty(this.laneX)) {
+ return new ArrayList<>();
+ }
List<Integer> list = JSON.parseArray(this.laneX, Integer.class);
if (list.isEmpty()) {
- return null;
+ return new ArrayList<>();
}
return list;
}
public List<Integer> getLaneY$() {
- if (null == this.laneY){ return null; }
+ if (null == this.laneY){ return new ArrayList<>(); }
+ if (Cools.isEmpty(this.laneY)) {
+ return new ArrayList<>();
+ }
List<Integer> list = JSON.parseArray(this.laneY, Integer.class);
if (list.isEmpty()) {
- return null;
+ return new ArrayList<>();
}
return list;
}
--
Gitblit v1.9.1