From 1b88d2343f08f6bd3ac3250b5d532cfe80f5f37b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 05 十一月 2024 08:24:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 7 ++++---
1 files changed, 4 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 a18a163..0a54bcf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -150,13 +150,14 @@
.eq("loc_no", shallowLoc));
if (!Cools.isEmpty(locMast2)) {
if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){
- tmp = locMast2;
+ tmp = mast;
}
}
}else {
if (!Cools.isEmpty(mast)) {
- tmp = mast;
-
+ if (mast.getLocSts().equals("O")){
+ tmp = mast;
+ }
}
}
//棰勭暀绌哄簱浣�
--
Gitblit v1.9.1