From ad6a05f2535c1f29a764f352d8ca666cae1b97d1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 22 二月 2025 17:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/project_management-java
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index dc078f0..f81ae05 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -163,10 +163,6 @@
<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.used_status != 2-->
@@ -175,9 +171,12 @@
and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
</if>
</if>
- <!--${query.params.dataScope}-->
+ <!-- 涓氫富鏁版嵁鏉冮檺 -->
+ <if test="query.role == 0">
+ ${query.params.dataScope}
+ </if>
</where>
- order by TPI.gmt_create
+ order by TPI.id DESC
</select>
<select id="homeCount" parameterType="com.ycl.common.core.domain.BaseEntity" resultType="com.ycl.domain.vo.ProjectVO">
@@ -233,4 +232,17 @@
<select id="queryById" resultType="com.ycl.domain.entity.ProjectInfo">
select * from t_project_info where id = #{id} and deleted = 0
</select>
+
+ <resultMap id="pInfo" type="com.ycl.domain.entity.ProjectInfo">
+ <id column="id" property="id"/>
+ </resultMap>
+ <select id="checkProjectNameAndIdIsUnique" resultMap="pInfo">
+ select p.id from t_project_info p where p.project_name =#{name}
+ <if test="code !=null and code !=''">
+ or p.project_code =#{code}
+ </if>
+ having p.id != #{id}
+
+ </select>
+
</mapper>
--
Gitblit v1.8.0