From e4246536ec8218b0444667cbe457c0d3d6e67bd9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java
index 06eda77..1ac7413 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/OperatConditModelService.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.zt.common.service.BaseService;
import com.zt.common.utils.TreeUtils;
+import com.zt.common.utils.TreeUtils2;
import com.zt.life.modules.mainPart.taskReliability.dao.OperatConditModelDao;
import com.zt.life.modules.mainPart.taskReliability.model.ModelNodes;
import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
@@ -34,10 +35,10 @@
public List<OperatConditModel> page(QueryFilter queryFilter) {
List<OperatConditModel> list = baseDao.getList(queryFilter.getQueryParams());
for (OperatConditModel conditModel : list) {
- List<ModelRbd> modelList = baseDao.getModelList(conditModel.getId());
+ List<ModelRbd> modelList = baseDao.getModelList(conditModel.getProductId());
conditModel.setModelList(modelList);
}
- return TreeUtils.build(list);
+ return TreeUtils2.build(list);
}
--
Gitblit v1.9.1