From e05c88cc87a122a7877085234bfe55617886802c Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 06 三月 2026 17:42:54 +0800
Subject: [PATCH] 获取仓库数据添加使用验证，避免偶先排序null问题
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
index 9a7dfd0..60d0afc 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
@@ -249,6 +249,8 @@
companyId = ContextUtil.getCompanyId();
}
List<Depot> list = new ArrayList<>();
+ List<Depot> resultList = new ArrayList<>();
+
String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT) + "*";
Collection<String> keys = redisCache.keys(patten);
@@ -265,9 +267,26 @@
}
if (!list.isEmpty()) {
//閲嶆柊鎺掑簭
- Collections.sort(list, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
+ //妫�鏌ユ暟鎹槸鍚︿负绌�
+ for (Depot depot : list) {
+ if( null!=depot){
+ resultList.add(depot);
+ }
+ }
+ boolean hasNullOrderNum = true;
+ // 妫�鏌ユ槸鍚︽湁浠撳簱鐨勬帓搴忓彿涓虹┖
+ for (Depot depot : resultList) {
+ if ( null== depot.getOrderNum()) {
+ hasNullOrderNum = true;
+ break;
+ }
+ }
+ // 濡傛灉瀛樺湪鎺掑簭鍙蜂负绌虹殑浠撳簱锛屽垯涓嶈繘琛屾帓搴�
+ if (!hasNullOrderNum) {
+ Collections.sort(resultList, (p1, p2) -> p1.getOrderNum() - p2.getOrderNum());
+ }
}
- return list;
+ return resultList;
}
/**
--
Gitblit v1.9.3