From 2e4af4ece3016604568c644fba68b6d86afa8507 Mon Sep 17 00:00:00 2001
From: 123456 <123456>
Date: 星期二, 16 七月 2024 17:24:29 +0800
Subject: [PATCH] 报错信息修改

---
 performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
index bc1fba2..753a514 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
@@ -90,6 +90,9 @@
                 ids.addAll(users.stream().map(User::getId).distinct().collect(Collectors.toList()));
             }
         }
+        if (ids.size()==0){
+            ids=null;
+        }
         if (ObjectUtils.isNotEmpty(dates) && ObjectUtils.isNotEmpty(week)){
             String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
             String[] weeks = week.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
@@ -169,7 +172,7 @@
     public void exportWorkingHours(HttpServletResponse response) throws IOException {
         List<AuxiliaryOutputWorkingHoursDto> auxiliaryOutputWorkingHoursDtos = new ArrayList<>();
         List<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtos = new ArrayList<>();
-        List<Integer> ids = null;
+        List<Integer> ids = new ArrayList<>();
         //鍒ゆ柇鏄粍闀胯繕鏄粍鍛樿繕鏄鐞嗗憳
         Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryOutputWorkingHours");
         User user = userMapper.selectById(map1.get("userId"));

--
Gitblit v1.9.3