From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index 4739f1e..36801ea 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -167,18 +167,15 @@
<!-- <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.competent_department = #{query.competentDepartment}
- </if>
- </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}
</if>
</where>
- order by TPI.id DESC
+ ORDER BY FIELD(TPI.used_status, 1, -1, 0, 2), TPI.gmt_create DESC
</select>
<select id="homeCount" parameterType="com.ycl.common.core.domain.BaseEntity" resultType="com.ycl.domain.vo.ProjectVO">
--
Gitblit v1.8.0