From 786b5b76fee42107cef33892cbf7e3e8fab4f0e4 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:36:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java b/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java
index 01b7fbe..00e7ace 100644
--- a/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java
+++ b/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java
@@ -207,7 +207,7 @@
// 榛樿鑾峰彇绮儏鍒嗘満淇℃伅
DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGrainSer());
// 鑻ユ皵浣撳垎鏈洪厤缃笉涓虹┖锛屽垯鑾峰彇姘斾綋鐨勫垎鏈�
- if(StringUtils.isEmpty(depotConf.getGasSer())){
+ if(StringUtils.isNotEmpty(depotConf.getGasSer())){
deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGasSer());
}
@@ -265,7 +265,7 @@
// 榛樿鑾峰彇绮儏鍒嗘満淇℃伅
DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGrainSer());
// 鑻ユ皵浣撳垎鏈洪厤缃笉涓虹┖锛屽垯鑾峰彇姘斾綋鐨勫垎鏈�
- if(StringUtils.isEmpty(depotConf.getGasSer())){
+ if(StringUtils.isNotEmpty(depotConf.getGasSer())){
deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGasSer());
}
--
Gitblit v1.9.3