From 5528e869fc25354fe62fbb228cfdd40e0df94dbc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 08:32:06 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/PlanMapper.xml |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/PlanMapper.xml b/src/main/resources/mapper/PlanMapper.xml
index 20b1160..6915a1e 100644
--- a/src/main/resources/mapper/PlanMapper.xml
+++ b/src/main/resources/mapper/PlanMapper.xml
@@ -64,19 +64,32 @@
         <choose>
             <when test="deptId != null and deptId != ''">
                 AND (CHARINDEX(','+#{deptId}+',', ','+sd.path+',') > 0 OR sd.id = #{deptId})
+                or
+                (
+                    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}
+                    user_id = #{userId}
+                    or
+                    mp.id in
+                    (
+                        select
+                        plan_id
+                        from man_plan_foll
+                        where 1=1
+                        and user_id = #{userId}
                     )
                 )
             </otherwise>
@@ -89,7 +102,6 @@
             mp.uuid like concat('%',#{condition},'%')
             or mp.name like concat('%',#{condition},'%')
             or mp.planner like concat('%',#{condition},'%')
-            or mp.remarks like concat('%',#{condition},'%')
             )
         </if>
         ORDER BY mp.create_time DESC

--
Gitblit v1.9.1