From 50fd1ca826d556657c09e4702a0f2de0d218b2c8 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 28 十一月 2024 00:06:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectProcessMapper.xml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectProcessMapper.xml b/business/src/main/resources/mapper/ProjectProcessMapper.xml
index 0b2fc68..1e3cf70 100644
--- a/business/src/main/resources/mapper/ProjectProcessMapper.xml
+++ b/business/src/main/resources/mapper/ProjectProcessMapper.xml
@@ -14,9 +14,9 @@
<result column="invest_type" property="investType" />
<result column="project_phase" property="projectPhase" />
<result column="tag" property="tag" />
- <result column="competent_department" property="competentDepartment" />
+<!-- <result column="competent_department" property="competentDepartment" />-->
<result column="area_code" property="areaCode" />
- <result column="management_centralization" property="managementCentralization" />
+<!-- <result column="management_centralization" property="managementCentralization" />-->
<result column="project_approval_type" property="projectApprovalType" />
<result column="investment_catalogue" property="investmentCatalogue" />
<result column="importance_type" property="importanceType" />
@@ -45,9 +45,6 @@
-
-
-
<select id="getById" resultMap="BaseResultMap">
SELECT
TPP.project_id,
@@ -65,8 +62,8 @@
PI.*,
TPP.flowable_process_id
FROM
- t_project_process TPP
- INNER JOIN t_project_info PI ON TPP.project_id = PI.id AND TPP.deleted = 0 AND PI.deleted = 0
+ t_project_info PI
+ LEFT JOIN t_project_process TPP ON TPP.project_id = PI.id AND TPP.deleted = 0 AND PI.deleted = 0
<where>
<if test="query.projectName != null and query.projectName != ''">
AND PI.project_name like concat('%', #{query.projectName}, '%')
--
Gitblit v1.8.0