From 427dcf8e63f17f67fa8c4223cbe45eb898714f91 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Wed, 26 Feb 2025 11:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=98=8E=E7=BB=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A4=9A=E7=BB=84=E7=BB=87=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/download/ExportFileController.java  |  8 +++++---
 .../mapper/att/AttendanceDetailsMapper.xml     | 18 ++++++++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java
index 211844d..42ae593 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java
@@ -1295,7 +1295,7 @@ public class ExportFileController {
     }
 
     /**
-     * 异常排名导出
+     * 考勤明细异常排名导出
      *
      * @param response
      * @param bean
@@ -1350,8 +1350,9 @@ public class ExportFileController {
                 dayTable.setStartDate(bean.getStartDate());
                 dayTable.setEndDate(bean.getEndDate());
                 dayTable.setName(bean.getUserName());
-                if (bean.getOrgId() != null) {
+                if (bean.getOrgId() != null || bean.getOrgIds() != null) {
                     dayTable.setOrgId(bean.getOrgId());
+                    dayTable.setOrgList(bean.getOrgIds());
                 }else{
                     //受限于当前登录人
                     if(bean.getOrgList() != null && !bean.getOrgList().isEmpty()){
@@ -1364,8 +1365,9 @@ public class ExportFileController {
                                 AttDataDetailsBean att = new AttDataDetailsBean();
                                 att.setStartDate(bean.getStartDate());
                                 att.setEndDate(bean.getEndDate());
-                                if (bean.getOrgId() != null) {
+                                if (bean.getOrgId() != null || bean.getOrgIds() != null) {
                                     att.setOrgId(bean.getOrgId());
+                                    att.setOrgList(bean.getOrgIds());
                                 }else{
                                     //受限于当前登录人
                                     if(bean.getOrgList() != null && !bean.getOrgList().isEmpty()){
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml
index 9d972a5..c447faf 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttendanceDetailsMapper.xml
@@ -23,7 +23,7 @@
             )
         </foreach>
     </insert>
-
+    <!--orgList与orgIds不同，一个是权限获取的，一个是前端选择的，不放在一起是防止下拉全权限错误导致查询范围变大 -->
     <select id="selectAttDetailsList" resultType="com.bonus.system.att.entity.AttDataDetailsBean">
         select su.user_name, so.org_name,IF(awa.outCount is null,0,awa.outCount) as outCount,
                COUNT(DISTINCT asd.att_current_time ) AS attCount,
@@ -37,6 +37,13 @@
         <if test="bean.orgId != null and bean.orgId != ''">
             AND v.org_id = #{bean.orgId}
         </if>
+        <if test='bean.orgIds != null and bean.orgIds.size() > 0'>
+            and v.org_id in (
+            <foreach collection="bean.orgIds" item="item" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
         <if test="bean.userId != null and bean.userId != ''">
             AND v.user_id = #{bean.userId}
         </if>
@@ -74,7 +81,6 @@
             </foreach>
             )
         </if>
-
         GROUP BY
         v.att_current_day,
         v.user_id
@@ -82,6 +88,7 @@
         v.att_current_day DESC
     </select>
 
+    <!--orgList与orgIds不同，一个是权限获取的，一个是前端选择的，不放在一起是防止下拉全权限错误导致查询范围变大 -->
     <select id="exportAttDetailsList" resultType="com.bonus.system.att.entity.AttDataDetailsBean">
         SELECT
         v.user_id,
@@ -107,6 +114,13 @@
         <if test="bean.orgId != null and bean.orgId != ''">
             AND v.org_id = #{bean.orgId}
         </if>
+        <if test='bean.orgIds != null and bean.orgIds.size() > 0'>
+            and v.org_id in (
+            <foreach collection="bean.orgIds" item="item" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
         <if test="bean.userName != null and bean.userName != ''">
             AND su.user_name like concat('%', #{bean.userName}, '%')
         </if>