From 3f7f87ceee1a5651123b50253a6009bcdc5aa58d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 27 十一月 2023 13:57:46 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/PlanMapper.xml | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/PlanMapper.xml b/src/main/resources/mapper/PlanMapper.xml
index 7d278b0..8d53aaf 100644
--- a/src/main/resources/mapper/PlanMapper.xml
+++ b/src/main/resources/mapper/PlanMapper.xml
@@ -34,6 +34,12 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
+ <result column="user_xml_sel_phone" property="userXmlSelPhone" />
+ <result column="director" property="director" />
+ <result column="status2" property="status2" />
+ <result column="assistant_plan_id" property="assistantPlanId" />
+ <result column="host_plan_id" property="hostPlanId" />
+ <result column="assistant_host_sign" property="assistantHostSign" />
</resultMap>
@@ -63,20 +69,37 @@
WHERE 1=1
<choose>
<when test="deptId != null and deptId != ''">
- AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
+ AND ( (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
+ or
+ (
+ mp.user_id = #{userId}
+ or
+ mp.id in
+ (
+ select
+ plan_id
+ from man_plan_foll
+ where 1=1
+ and user_id = #{userId}
+ )
+ ))
</when>
<otherwise>
and
(
- user_id = #{userId}
- or
- mp.id in
- (
- select
- order_id
- from man_order_foll
- where 1=1
- and user_id = #{userId}
+ <if test="userId != null and userId != ''">
+ mp.user_id = #{userId}
+ or
+ mp.director = #{userId}
+ or
+ </if>
+ mp.id in
+ (
+ select
+ plan_id
+ from man_plan_foll
+ where 1=1
+ and user_id = #{userId}
)
)
</otherwise>
@@ -91,6 +114,9 @@
or mp.planner like concat('%',#{condition},'%')
)
</if>
+ <if test="director != null and director != ''">
+ or mp.director = #{director}
+ </if>
ORDER BY mp.create_time DESC
</select>
--
Gitblit v1.9.1