From 5491c4c6a6f031155525e34c518d0537a90f4859 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 08 六月 2024 21:30:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index adfcf81..a18a163 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -147,12 +147,11 @@
if (groupLoc) {
String shallowLoc = Utils.getDeepLoc(slaveProperties, mast.getLocNo());
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+ .eq("loc_no", shallowLoc));
if (!Cools.isEmpty(locMast2)) {
- tmp = locMast2;
-
- }else {
- tmp = mast;
+ if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){
+ tmp = locMast2;
+ }
}
}else {
if (!Cools.isEmpty(mast)) {
--
Gitblit v1.9.1