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 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 holidays = dao.getFestivalAndHoliday(bean); - + // + if ("1".equals(attType)) { + holidays.clear(); + } // 将节假日转换为 Set,提高查找效率 Set 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' +