From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 5e0dd68..9baa9f5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -431,9 +431,13 @@
if (wrkDetls.get(0).getOrderNo() != null) {
for (WrkDetl wrkDetl : wrkDetls) {
String orderNo$ = "";
- JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
- resultRecords.add(detlDto.getOrderNo());
- });
+ if(!wrkDetl.getOrderNo().startsWith("[") || !wrkDetl.getOrderNo().endsWith("]")) {
+ return wrkDetl.getOrderNo();
+ } else {
+ JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
+ resultRecords.add(detlDto.getOrderNo());
+ });
+ }
}
}
--
Gitblit v1.9.1