From f2a1b152a8bc97003ed040cd308af134be81ab47 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Tue, 18 Oct 2022 15:43:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/CensusController.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java index dc0f3f18..d8ddc33b 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java @@ -485,11 +485,11 @@ public class CensusController { ArrayList resultList = (ArrayList) resourceService.selectCensusResourceTable(params); List> date = resultList.stream().map(index -> { List data = new ArrayList<>(); - data.add(index.getOrDefault("deptName", "")); - data.add(index.getOrDefault("type", "")); - data.add(index.getOrDefault("resourceName", "")); - data.add(index.getOrDefault("createDate", "")); - data.add(index.getOrDefault("approveStatus", "").toString()); + data.add(index.getOrDefault("deptName", "") == null ? "" : index.getOrDefault("deptName", "").toString()); + data.add(index.getOrDefault("type", "") == null ? "" : index.getOrDefault("type", "").toString()); + data.add(index.getOrDefault("resourceName", "") == null ? "" : index.getOrDefault("resourceName", "").toString()); + data.add(index.getOrDefault("createDate", "") == null ? "" : index.getOrDefault("createDate", "").toString()); + data.add(index.getOrDefault("approveStatus", "") == null ? "" : index.getOrDefault("approveStatus", "").toString()); return data; }).collect(Collectors.toList()); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); @@ -550,12 +550,12 @@ public class CensusController { ArrayList resultList = (ArrayList) resourceService.selectCensusApplyTable(params); List> date = resultList.stream().map(index -> { List data = new ArrayList<>(); - data.add(index.getOrDefault("resourceDeptName", "")); - data.add(index.getOrDefault("resourceName", "")); - data.add(index.getOrDefault("type", "")); - data.add(index.getOrDefault("deptName", "")); - data.add(index.getOrDefault("createDate", "")); - data.add(index.getOrDefault("approveStatus", "")); + data.add(index.getOrDefault("resourceDeptName", "") == null ? "" : index.getOrDefault("resourceDeptName", "").toString()); + data.add(index.getOrDefault("resourceName", "") == null ? "" : index.getOrDefault("resourceName", "").toString()); + data.add(index.getOrDefault("type", "") == null ? "" : index.getOrDefault("type", "").toString()); + data.add(index.getOrDefault("deptName", "") == null ? "" : index.getOrDefault("deptName", "").toString()); + data.add(index.getOrDefault("createDate", "") == null ? "" : index.getOrDefault("createDate", "").toString()); + data.add(index.getOrDefault("approveStatus", "") == null ? "" : index.getOrDefault("approveStatus", "").toString()); return data; }).collect(Collectors.toList()); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");