From 8dc551f4a4e42cc8d5e7effa3c252389e39a9a4e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 14 一月 2025 16:09:39 +0800
Subject: [PATCH] 空指针bug
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index ac32a87..b02a2b9 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -105,7 +105,6 @@
LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
<where>
TPI.deleted = 0
- and TPI.used_status = 2
<if test="query.projectName !=null and query.projectName!=''">
and TPI.project_name like concat('%',#{query.projectName},'%')
</if>
@@ -151,9 +150,20 @@
<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 == 3">
and (TPI.project_status = 'working' or TPI.project_status = 'stop')
</if>
+ <if test="query.projectCategory == 6">
+ <if test="query.role == 0">
+ and TPI.create_by = #{query.createBy}
+ </if>
+ <if test="query.role == 1">
+ and TPI.used_status = #{query.usedStatus}
+ </if>
+ </if>
</where>
order by TPI.gmt_create
</select>
--
Gitblit v1.8.0