From 5f614dec95ae76eff3942508b175505dff1502d0 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期二, 04 三月 2025 09:49:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StAdjustConfigServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StAdjustConfigServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StAdjustConfigServiceImpl.java
index 6ced3b9..60a5a8a 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StAdjustConfigServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StAdjustConfigServiceImpl.java
@@ -88,12 +88,15 @@
}
public StAdjustConfigEntity getByModelId(String modelId) {
- return baseDao.selectOne("schedule_model_id", modelId);
+ return baseDao.selectOne("schedule_model_id", modelId,"status",1);
}
public List<StAdjustConfigDetEntity> getDetByModelId(String modelId) {
StAdjustConfigEntity configEntity = getByModelId(modelId);
+ if (null == configEntity) {
+ return null;
+ }
return stAdjustConfigDetService.getListByConfigId(configEntity.getId());
}
}
\ No newline at end of file
--
Gitblit v1.9.3