From 973590171b483627b9e5c556302c02000fd666fc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 八月 2024 16:50:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d60e71b..53f15e0 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -484,7 +484,9 @@
}
for (LocMast locMast2 : locMasts) {
if (locMast2.getLocSts().equals("O") ) {
- locMast = locMast2;
+ if (locMast == null){
+ locMast = locMast2;
+ }
}else if (locMast2.getLocSts().equals("F")){
locMast = null;
}
@@ -526,7 +528,9 @@
}
for (LocMast locmast3 : locMasts) {
if (locmast3.getLocSts().equals("O")){
- locMast = locmast3;
+ if (locMast == null){
+ locMast = locmast3;
+ }
}else if (locmast3.getLocSts().equals("F")){
locMast = null;
}
@@ -544,7 +548,9 @@
}
for (LocMast locmast : locMasts) {
if (locmast.getLocSts().equals("O") ) {
- locMast = locmast;
+ if (locMast == null){
+ locMast = locmast;
+ }
}else if (locmast.getLocSts().equals("D")){
locMast = null;
}
--
Gitblit v1.9.1