From ee487a7ac3dfb1b2a07aaceef9e6d6b6abc88a02 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 28 二月 2023 11:25:25 +0800
Subject: [PATCH] 优化部门

---
 java110-db/src/main/resources/mapper/report/ReportAttendanceServiceDaoImplMapper.xml |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/report/ReportAttendanceServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportAttendanceServiceDaoImplMapper.xml
index 3a8e4d7..ea8c22a 100755
--- a/java110-db/src/main/resources/mapper/report/ReportAttendanceServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportAttendanceServiceDaoImplMapper.xml
@@ -43,7 +43,6 @@
         SELECT
         t.staff_name staffName,
         t.staff_id staffId,
-        uo.org_name departmentName,
         t.classes_id classesId,
         ac.classes_name classesName,
         (
@@ -143,10 +142,12 @@
         AND ac.status_cd = '0'
         LEFT JOIN u_user s ON t.staff_id = s.user_id
         AND s.status_cd = '0'
-        LEFT JOIN u_org_staff_rel uosr ON uosr.staff_id = s.user_id
-        AND uosr.status_cd = '0'
-        LEFT JOIN u_org uo ON uosr.org_id = uo.org_id
-        AND uo.status_cd = '0'
+        <if test="departmentId !=null and departmentId != ''">
+            LEFT JOIN u_org_staff_rel uosr ON uosr.staff_id = s.user_id
+            AND uosr.status_cd = '0'
+            LEFT JOIN u_org uo ON uosr.org_id = uo.org_id
+            AND uo.status_cd = '0'
+        </if>
         WHERE
         t.status_cd = '0'
         <if test="staffName !=null and staffName != ''">

--
Gitblit v1.8.0