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/ProjectInfoMapper.xml | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml index b02a2b9..d196b96 100644 --- a/business/src/main/resources/mapper/ProjectInfoMapper.xml +++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml @@ -103,6 +103,7 @@ LEFT JOIN t_project_investment_policy_compliance TPIPC ON TPI.id = TPIPC.project_id and TPIPC.deleted = 0 LEFT JOIN t_project_unit_registration_info TPURI ON TPI.id = TPURI.project_id and TPURI.deleted = 0 LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0 + LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit <where> TPI.deleted = 0 <if test="query.projectName !=null and query.projectName!=''"> @@ -164,16 +165,22 @@ and TPI.used_status = #{query.usedStatus} </if> </if> + ${query.params.dataScope} </where> order by TPI.gmt_create </select> - <select id="homeCount" resultType="com.ycl.domain.vo.ProjectVO"> + <select id="homeCount" parameterType="com.ycl.common.core.domain.BaseEntity" resultType="com.ycl.domain.vo.ProjectVO"> SELECT TPI.*,TPIF.total_investment,TPP.process_ins_id as processId FROM t_project_info TPI LEFT JOIN t_project_investment_funding TPIF ON TPI.id = TPIF.project_id and TPIF.deleted = 0 LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0 - WHERE TPI.deleted = 0 + LEFT JOIN sys_dept d ON TPI.project_owner_unit = d.dept_id + <where> + TPI.deleted = 0 + ${params.dataScope} + </where> + </select> <select id="selectProjectDetailByIds" resultType="com.ycl.domain.vo.ProjectVO"> -- Gitblit v1.8.0