From 7f5c99de7dd1b07ac8f33d991f46112803d24ebb Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Wed, 22 Jan 2025 14:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=8C=BA=E5=88=86=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/boot/manager/manager/dao/WeChatDao.java    | 1 +
 .../manager/manager/service/impl/WeChatServiceImpl.java  | 9 ++++++++-
 src/main/resources/mappers/wechat/WeChatMapper.xml       | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bonus/boot/manager/manager/dao/WeChatDao.java b/src/main/java/com/bonus/boot/manager/manager/dao/WeChatDao.java
index 3ba4df4..3b6174b 100644
--- a/src/main/java/com/bonus/boot/manager/manager/dao/WeChatDao.java
+++ b/src/main/java/com/bonus/boot/manager/manager/dao/WeChatDao.java
@@ -103,4 +103,5 @@ public interface WeChatDao {
 	 */
 	List<LeaveReportingBean> getFestivalAndHoliday(LeaveReportingBean bean);
 
+    String getAttTypeByUserId(Long userId);
 }
diff --git a/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java b/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java
index f4510e6..71db349 100644
--- a/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java
+++ b/src/main/java/com/bonus/boot/manager/manager/service/impl/WeChatServiceImpl.java
@@ -148,9 +148,16 @@ public class WeChatServiceImpl implements WeChatService {
     @Override
     public String getDays(LeaveReportingBean bean) {
         try {
+            //获取登录人员的userId
+            Long userId = Long.valueOf(UserUtil.getLoginUser().getUserId());
+            //1 项目部 0公司机关
+            String attType= dao.getAttTypeByUserId(userId);
             // 查询出所有周末以及节假日的日期
             List<LeaveReportingBean> holidays = dao.getFestivalAndHoliday(bean);
-
+            //
+            if ("1".equals(attType)) {
+                holidays.clear();
+            }
             // 将节假日转换为 Set<String>，提高查找效率
             Set<String> holidaySet = new HashSet<>();
             for (LeaveReportingBean holiday : holidays) {
diff --git a/src/main/resources/mappers/wechat/WeChatMapper.xml b/src/main/resources/mappers/wechat/WeChatMapper.xml
index 8f42689..4286a87 100644
--- a/src/main/resources/mappers/wechat/WeChatMapper.xml
+++ b/src/main/resources/mappers/wechat/WeChatMapper.xml
@@ -305,5 +305,9 @@
         where
             type ='1'
     </select>
+    <select id="getAttTypeByUserId" resultType="java.lang.String">
+        SELECT is_pd FROM `sys_user_wechat`
+        WHERE user_id = #{userId}
+    </select>
 
 </mapper>