From 02d01ad170a9031a13279a479e3957812a0cd76f Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Fri, 25 Nov 2022 09:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=BD=BF=E7=94=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=A1=A8=E5=A4=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/renren/common/controller/CensusController.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 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<Map> resultList = (ArrayList<Map>) resourceDao.selectCensusApplyTable(params);
         List<List<Object>> date = resultList.stream().map(index -> {
             List<Object> 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<List<String>> exportSelectCensusApplyTableHead() {
         List<List<String>> list = new ArrayList<>();
         List<String> head0 = new ArrayList<>();
-        head0.add("提供部门");
+        head0.add("申请部门");
         List<String> head1 = new ArrayList<>();
         head1.add("资源名称");
         List<String> head2 = new ArrayList<>();
         head2.add("类型");
         List<String> head3 = new ArrayList<>();
-        head3.add("申请部门");
+        head3.add("提供部门");
         List<String> head4 = new ArrayList<>();
         head4.add("日期");
         List<String> head5 = new ArrayList<>();