From 4cb27d670be4437d5cbfbf6676e1f8387cd1e5d2 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 11 二月 2025 14:02:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/resources/mapper/ProjectProcessMapper.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml index 37c80a6..6aded0e 100644 --- a/business/src/main/resources/mapper/ProjectProcessMapper.xml +++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml @@ -64,9 +64,10 @@ TPP.process_ins_id FROM t_project_info PI - LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0 AND PI.deleted = 0 + LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0 LEFT JOIN sys_dept d ON d.dept_id = PI.project_owner_unit <where> + AND PI.used_status = 2 AND PI.deleted = 0 <if test="query.projectName != null and query.projectName != ''"> AND PI.project_name like concat('%', #{query.projectName}, '%') </if> -- Gitblit v1.8.0