From 2aa0ffa6eea188f44eabc50617ddf97c804fc89f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 21 九月 2023 16:32:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index c8f1e6b..19f4175 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -160,7 +160,7 @@
<select id="planUser" parameterType="String" resultMap="ArdAppPatrolplanResult">
select s.nick_name, plan.plan_name from ard_app_patrolplan plan
LEFT JOIN ard_app_patroluser users on users.patrolplan_id = plan."id"
- left join sys_user s on users.app_user_id = s.user_id
+ left join sys_user s on plan.user_id = s.user_id
where users.app_user_id = #{userId} and son is null
and plan.create_time >= #{beforeTime} and plan.create_time <= #{time}
and del_name is null and del_time is null order by plan.create_time desc;
--
Gitblit v1.9.3