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 | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 58f25dd..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(",");
@@ -167,9 +170,9 @@
//瀵煎嚭
@Override
public void exportWorkingHours(HttpServletResponse response) throws IOException {
- List<AuxiliaryOutputWorkingHoursDto> auxiliaryOutputWorkingHoursDtos = null;
- List<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtos = null;
- List<Integer> ids = null;
+ List<AuxiliaryOutputWorkingHoursDto> auxiliaryOutputWorkingHoursDtos = new ArrayList<>();
+ List<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtos = new ArrayList<>();
+ List<Integer> ids = new ArrayList<>();
//鍒ゆ柇鏄粍闀胯繕鏄粍鍛樿繕鏄鐞嗗憳
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryOutputWorkingHours");
User user = userMapper.selectById(map1.get("userId"));
@@ -199,7 +202,7 @@
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("UTF-8");
// 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
- String fileName = URLEncoder.encode("宸ユ椂绠＄悊瀵煎嚭", "UTF-8");
+ String fileName = URLEncoder.encode("鏃ュ伐鏃剁鐞嗗鍑�", "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
try {
// 鏂板缓ExcelWriter
--
Gitblit v1.9.3