From f5a366b2c3b200006983f3a40872bc4976a884d7 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 11 二月 2025 18:38:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/resources/mapper/ProjectInfoMapper.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml index 9c04cba..468764e 100644 --- a/business/src/main/resources/mapper/ProjectInfoMapper.xml +++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml @@ -163,11 +163,11 @@ and TPI.project_owner_unit = #{query.projectOwnerUnit} </if> <if test="query.projectCategory == 6"> - <if test="query.role == 0"> - and TPI.used_status != 2 - </if> +<!-- <if test="query.role == 0">--> +<!-- and TPI.used_status != 2--> +<!-- </if>--> <if test="query.role == 1"> - and TPI.used_status = 1 and TPI.competent_department like concat('%',#{query.competentDepartment},'%') + and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0 </if> </if> <!--${query.params.dataScope}--> -- Gitblit v1.8.0