From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 20 一月 2025 18:25:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/resources/mapper/ProjectProcessMapper.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml index aa8f67a..37c80a6 100644 --- a/business/src/main/resources/mapper/ProjectProcessMapper.xml +++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml @@ -65,6 +65,7 @@ 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 sys_dept d ON d.dept_id = PI.project_owner_unit <where> <if test="query.projectName != null and query.projectName != ''"> AND PI.project_name like concat('%', #{query.projectName}, '%') @@ -72,6 +73,7 @@ <if test="query.projectCode != null and query.projectCode != ''"> AND PI.project_code like concat('%', #{query.projectCode}, '%') </if> + ${query.params.dataScope} </where> </select> -- Gitblit v1.8.0