From 23b688e436a89845e92d861adb5875e625e90d9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 14 三月 2025 11:43:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 2b37ad7..ea83801 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -164,14 +164,12 @@
<!-- <if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">-->
<!-- and TPP.process_ins_id is not null-->
<!-- </if>-->
- <if test="query.projectPhase == 3">
- and (TPI.project_status = 'working' or TPI.project_status = 'stop')
- </if>
- <if test="query.projectPhase == null">
- <if test="query.role != null and query.role == 1">
- and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
- </if>
- </if>
+<!-- <if test="query.projectPhase == 3">-->
+<!-- and (TPI.project_status = 'working' or TPI.project_status = 'stop')-->
+<!-- </if>-->
+<!-- <if test="query.role != null and query.role == 1">-->
+<!-- and TPI.competent_department = #{query.competentDepartment}-->
+<!-- </if>-->
<!-- 涓氫富鏁版嵁鏉冮檺 -->
<if test="query.role != null and query.role == 0">
${query.params.dataScope}
--
Gitblit v1.8.0