From 87d9c1cd12721d9262e167b5f7451f51fe0fa5cb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 08 二月 2025 11:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index dc8f634..9c04cba 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -45,6 +45,7 @@
TPI.gmt_update,
TPI.update_by,
TPI.create_by,
+ TPI.remark,
TPI.id
FROM
t_project_info TPI
@@ -103,7 +104,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
+-- 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!=''">
@@ -151,21 +152,25 @@
<if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
and TPP.process_ins_id is not null
</if>
-<!-- <if test="query.projectCategory == null">-->
-<!-- and TPI.used_status = 2-->
-<!-- </if>-->
+ <if test="query.projectCategory != 6">
+ and TPI.used_status = 2
+ </if>
<if test="query.projectCategory == 3">
and (TPI.project_status = 'working' or TPI.project_status = 'stop')
</if>
+ <!-- 涓氫富鏁版嵁鏉冮檺 -->
+ <if test="query.role == 0">
+ and TPI.project_owner_unit = #{query.projectOwnerUnit}
+ </if>
<if test="query.projectCategory == 6">
<if test="query.role == 0">
- and TPI.create_by = #{query.createBy}
+ and TPI.used_status != 2
</if>
<if test="query.role == 1">
- and TPI.used_status = #{query.usedStatus}
+ and TPI.used_status = 1 and TPI.competent_department like concat('%',#{query.competentDepartment},'%')
</if>
</if>
- ${query.params.dataScope}
+ <!--${query.params.dataScope}-->
</where>
order by TPI.gmt_create
</select>
--
Gitblit v1.8.0