From f754e34c3822811bace989fae6a69dbcc3944d13 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 27 十二月 2024 14:41:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 12 +++++++-----
1 files changed, 7 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 1e047c8..0a54bcf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -147,15 +147,17 @@
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;
- break;
+ if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){
+ tmp = mast;
+ }
}
}else {
if (!Cools.isEmpty(mast)) {
- tmp = mast;
- break;
+ if (mast.getLocSts().equals("O")){
+ tmp = mast;
+ }
}
}
//棰勭暀绌哄簱浣�
--
Gitblit v1.9.1