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 412b5d45..f11f0943 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 @@ -597,10 +597,10 @@ public class CensusController { ArrayList resultList = (ArrayList) resourceDao.selectCensusApplyTable(params); List> date = resultList.stream().map(index -> { List data = new ArrayList<>(); - data.add(index.getOrDefault("resourceDeptName", "") == null ? "" : index.getOrDefault("resourceDeptName", "").toString()); + data.add(index.getOrDefault("deptName", "") == null ? "" : index.getOrDefault("deptName", "").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("resourceDeptName", "") == null ? "" : index.getOrDefault("resourceDeptName", "").toString()); data.add(index.getOrDefault("createDate", "") == null ? "" : index.getOrDefault("createDate", "").toString()); data.add(index.getOrDefault("approveStatus", "") == null ? "" : index.getOrDefault("approveStatus", "").toString()); return data; @@ -618,13 +618,13 @@ public class CensusController { private List> exportSelectCensusApplyTableHead() { List> list = new ArrayList<>(); List head0 = new ArrayList<>(); - head0.add("提供部门"); + head0.add("申请部门"); List head1 = new ArrayList<>(); head1.add("资源名称"); List head2 = new ArrayList<>(); head2.add("类型"); List head3 = new ArrayList<>(); - head3.add("申请部门"); + head3.add("提供部门"); List head4 = new ArrayList<>(); head4.add("日期"); List head5 = new ArrayList<>();