From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001 From: wente <329538422@qq.com> Date: 星期四, 05 十二月 2024 09:40:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml index 7544e90..13730c8 100644 --- a/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml +++ b/modules/mainPart/src/main/resources/mapper/taskReliability/SimulatAssessDao.xml @@ -27,12 +27,12 @@ <select id="getChildren" resultType="com.zt.life.modules.mainPart.taskReliability.dto.ProductStatusDto"> select * from ( - SELECT f.id, f.name, 0 as sort, 1 as sameSbNum + SELECT f.id, f.name, 0 as sort, 1 as sameSbNum,f.product_type FROM product_model f WHERE f.id = ${productId} AND f.is_delete = 0 union - SELECT f.id, f.name, f.sort, g.basic_unit_num as sameSbNum + SELECT f.id, f.name, f.sort, g.basic_unit_num as sameSbNum,f.product_type FROM `task_phase` a, task_phase_model b, operat_condit c, -- Gitblit v1.9.1