From fa305af5d4ebfba47301fec3097296c14e32e1df Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 01 九月 2023 08:24:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 73c18da..aa38d65 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -410,6 +410,20 @@
}
}
+ //鍓旈櫎褰撳墠闅忔満鍫嗗灈鏈哄厓绱犲皾璇曢噸鏂版煡鎵�
+ if (locMast == null) {
+ ArrayList<Integer> crns = new ArrayList<>();
+ for (int crnNo : crnNos) {
+ if (randomCrnNo == crnNo) {
+ continue;
+ }
+ crns.add(crnNo);
+ }
+ if (!crns.isEmpty()) {
+ return getLocNoStep3(locTypeDto, crns);
+ }
+ }
+
return locMast;
}
@@ -464,6 +478,20 @@
}
}
+ //鍓旈櫎褰撳墠闅忔満鍫嗗灈鏈哄厓绱犲皾璇曢噸鏂版煡鎵�
+ if (locMast == null) {
+ ArrayList<Integer> crns = new ArrayList<>();
+ for (int crnNo : crnNos) {
+ if (randomCrnNo == crnNo) {
+ continue;
+ }
+ crns.add(crnNo);
+ }
+ if (!crns.isEmpty()) {
+ return getLocNoStep4(locTypeDto, crns);
+ }
+ }
+
return locMast;
}
--
Gitblit v1.9.1