From 9f83a9d589aaf22cb790515272a425216ea618b2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 27 九月 2025 16:57:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |    6 ++++++
 1 files changed, 6 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 e1761f0..faefd3f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -198,6 +198,9 @@
             List<Integer> levList = basCrnpService.getLevList();
             Collections.shuffle(levList);
 
+            List<Integer> locLevList = locMastService.getLevList();
+            levList.addAll(locLevList);
+
             for (Integer lev : levList) {
                 List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                         .eq("loc_sts", "O")
@@ -281,6 +284,9 @@
             List<Integer> levList = basCrnpService.getLevList();
             Collections.shuffle(levList);
 
+            List<Integer> locLevList = locMastService.getLevList();
+            levList.addAll(locLevList);
+
             for (Integer lev : levList) {
                 //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
                 List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()

--
Gitblit v1.9.1