日期区分项目部

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);
 }

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) {

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>