From 441dfbd1908affc1accc52006a2fe81a5067052d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 22 六月 2026 09:28:09 +0800
Subject: [PATCH] 废品库存的批号如果有多个,则需要展示多个

---
 src/main/resources/mapper/staff/PersonalShiftMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/staff/PersonalShiftMapper.xml b/src/main/resources/mapper/staff/PersonalShiftMapper.xml
index 69bcae3..bd1e5fc 100644
--- a/src/main/resources/mapper/staff/PersonalShiftMapper.xml
+++ b/src/main/resources/mapper/staff/PersonalShiftMapper.xml
@@ -20,6 +20,7 @@
         LEFT JOIN staff_on_job u ON u.id = s.staff_on_job_id
         LEFT JOIN personal_attendance_location_config palc ON palc.id = s.personal_attendance_location_config_id
         <where>
+            u.id IS NOT NULL
             <if test="sysDeptId != null and sysDeptId != ''">
                 and u.sys_dept_id = #{sysDeptId}
             </if>
@@ -31,9 +32,9 @@
             </if>
         </where>
         GROUP BY u.id, u.staff_name
-        ORDER BY MAX(s.create_time)
+        ORDER BY MAX(s.create_time) desc
     </select>
-   
+
     <select id="performanceShiftYear" resultType="java.util.Map">
          SELECT
          u.staff_name name,

--
Gitblit v1.9.3