From 4d9364da736f322cfeeec2815e83f2a3f6534223 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index 4324a38..ac10624 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -14,7 +14,7 @@
if(u2.department is not null and u2.department != '', CONCAT(u2.name, '锛�', u2.department, '锛�'), u2.name) name,
GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�', s.id order by s.work_time SEPARATOR ';') AS shift_time, u2.id user_id
FROM performance_shift s
- LEFT JOIN (SELECT u.* from
+ LEFT JOIN (SELECT distinct u.* from
user u
left join department_lims dl on FIND_IN_SET(dl.id,u.depart_lims_id)
where state=1
--
Gitblit v1.9.3