From 4753c019b4cb00c127ac83148dd820d271bea048 Mon Sep 17 00:00:00 2001 From: chen_xi <276999030@qq.com> Date: Fri, 30 Sep 2022 09:21:27 +0800 Subject: [PATCH] 多站单参接口修改回原接口 --- screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java index 6b48252..a551074 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java @@ -83,9 +83,11 @@ MultipartFile file5 = files.get(4); Map<String, Object> map5 = getMap5(file5); map.put("c5",map5); - MultipartFile file6 = files.get(5); - Map<String, Object> map6 = getMap6(file6); - map.put("c6",map6); + if (files.size()>5){ + MultipartFile file6 = files.get(5); + Map<String, Object> map6 = getMap6(file6); + map.put("c6",map6); + } String s = JSON.toJSONString(map); excel1.setValue(s); excel1.setTime(date); @@ -113,9 +115,11 @@ MultipartFile file5 = files.get(4); Map<String, Object> map5 = getMap5(file5); map.put("c5",map5); - MultipartFile file6 = files.get(5); - Map<String, Object> map6 = getMap6(file6); - map.put("c6",map6); + if (files.size()>5){ + MultipartFile file6 = files.get(5); + Map<String, Object> map6 = getMap6(file6); + map.put("c6",map6); + } String s = JSON.toJSONString(map); excel.setValue(s); excelMapper.updateById(excel); -- Gitblit v1.8.0