From 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期五, 02 八月 2024 10:04:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/resources/mapper/taskReliability/TaskRepairParamDao.xml | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskRepairParamDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskRepairParamDao.xml index 3d511d1..06f34e3 100644 --- a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskRepairParamDao.xml +++ b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskRepairParamDao.xml @@ -36,10 +36,9 @@ and e.is_delete = 0 and f.id = e.node_id and f.is_delete = 0 - and f.equip_type is not null and f.equip_type <> '' + and f.equip_type is not null and g.product_id = f.id and g.is_delete = 0 - and g.reliab_distrib_type = 2 and g.repairable = 1 ) c group by task_id, phase_id, phase_name, phase_sort, equip_type -- Gitblit v1.9.1