From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 3cc6230..666bfd7 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -157,7 +157,7 @@
List<DepotConf> data = getCacheDepotConf(companyId);
if (null == data) return null;
- return data.stream().filter(item -> (serId.equals(item.getGrainSer()) || serId.equals(item.getGasSer()) || serId.equals(item.getEsSer()) ))
+ return data.stream().filter(item -> (serId.equals(item.getGrainSer()) || serId.equals(item.getGasSer()) || serId.equals(item.getEsSer())))
.findAny().orElse(null);
}
@@ -195,6 +195,7 @@
List<DepotSerData> listAll = (List<DepotSerData>) redisUtil.get(key);
if (null == listAll || listAll.isEmpty()) {
log.error("娌℃湁鑾峰彇鍒颁粨搴撲笌鍒嗘満鐨勫叧绯绘暟鎹紝璇疯仈绯荤鐞嗗憳锛�");
+ return null;
}
Map<String, DepotSerData> tempMap = new HashMap<>();
@@ -321,6 +322,9 @@
public void addDepotStore(DepotStore store, boolean updateDepot) {
if (null == store.getUpdateDate()) store.setUpdateDate(new Date());
if (null == store.getId()) store.setId(ContextUtil.getUUID());
+ if (null == store.getManageType() || "".equals(store.getManageType())) {
+ store.setManageType("01");
+ }
commonMapper.addDepotStore(store);
--
Gitblit v1.9.3