From ee8b14b27cae9f0a518d5c9a68023f8f6734cde3 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Wed, 22 Jan 2025 09:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=B7=E5=81=87=E7=AD=89?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=85=AC=E5=8F=B8=E6=88=96=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=83=A8=E5=8C=BA=E5=88=86=E6=98=AF=E5=90=A6=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E5=91=A8=E5=85=AD=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../leaveReporting/dao/LeaveReportingDao.java      |  2 ++
 .../service/LeaveReportingServiceImpl.java         | 14 ++++++++------
 .../mapper/LeaveReporting/LeaveReportingMapper.xml |  7 +++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/dao/LeaveReportingDao.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/dao/LeaveReportingDao.java
index 6958ac0..0e7ca67 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/dao/LeaveReportingDao.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/dao/LeaveReportingDao.java
@@ -39,4 +39,6 @@ public interface LeaveReportingDao {
     List<LeaveReportingBean> getUserList(@Param("params")LeaveReportingBean bean);
 
     List<LeaveReportingBean> getFestivalAndHoliday(LeaveReportingBean bean);
+
+    String getAttTypeByUserId(Long userId);
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/service/LeaveReportingServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/service/LeaveReportingServiceImpl.java
index 0e79a27..2522275 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/service/LeaveReportingServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/leaveReporting/service/LeaveReportingServiceImpl.java
@@ -123,24 +123,26 @@ public class LeaveReportingServiceImpl implements LeaveReportingService {
     @Override
     public LeaveReportingBean getDays(LeaveReportingBean bean) {
         try {
+            //只能查自己部门的人
+            Long userId = SecurityUtils.getLoginUser().getSysUser().getUserId();
+            //1 公司机关 2 项目部
+            String attType= leaveReportingDao.getAttTypeByUserId(userId);
             // 查询出所有周末以及节假日的日期
-            List<LeaveReportingBean> holidays = leaveReportingDao.getFestivalAndHoliday(bean);
-
+            List<LeaveReportingBean>  holidays = leaveReportingDao.getFestivalAndHoliday(bean);
+            if("2".equals(attType)){
+                holidays.clear();
+            }
             // 将节假日转换为 Set<String>，提高查找效率
             Set<String> holidaySet = new HashSet<>();
             for (LeaveReportingBean holiday : holidays) {
                 holidaySet.add(holiday.getDate());
             }
-
             Date startDate = null;
             startDate = parseDate(String.valueOf(bean.getLeaveStartDate()));
             Date endDate = parseDate(String.valueOf(bean.getLeaveEndDate()));
-
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(startDate);
-
             int totalDays = 0;
-
             while (!calendar.getTime().after(endDate)) {
                 String currentDate = formatDate(calendar.getTime());
                 if (!holidaySet.contains(currentDate)) {
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml
index 1fe4b47..181a364 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/LeaveReporting/LeaveReportingMapper.xml
@@ -198,4 +198,11 @@
             sys_holiday
         where type ='1'
     </select>
+    <select id="getAttTypeByUserId" resultType="java.lang.String">
+        SELECT att_type
+        FROM
+            att_group_person_relation agpr
+        left join att_group ag on agpr.group_id = ag.id
+        where user_id = #{userId} and agpr.is_active = '1'
+    </select>
 </mapper>
\ No newline at end of file