From f535e649669ab84aba1fbad0577eeca9b1db142d Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Sun, 26 Sep 2021 09:27:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FirstPageStatisticsController.java         | 8 ++++----
 .../controller/PrincipalPeopleStatisticsController.java   | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/FirstPageStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/FirstPageStatisticsController.java
index 1ee1d357..3d88df6c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/FirstPageStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/FirstPageStatisticsController.java
@@ -37,10 +37,10 @@ public class FirstPageStatisticsController {
         List<CompanyComeMoneyList> pageList3 = payWorkingGroupService.queryPageListForCompanyFirstPage();
         List<DepartStatistics> pageList4 = payWorkingGroupService.queryPageListForDepartFirstPage();
         HashMap<String, Object> hashMap = new HashMap<>();
-        hashMap.put("PrincipalPeople",pageList);
-        hashMap.put("PayWorkingGroup",pageList2);
-        hashMap.put("Company",pageList3);
-        hashMap.put("Depart",pageList4);
+        hashMap.put("principalPeople",pageList);
+        hashMap.put("payWorkingGroup",pageList2);
+        hashMap.put("company",pageList3);
+        hashMap.put("depart",pageList4);
         return Result.OK(hashMap);
     }
 }
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
index 272f0886..54896bb4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
@@ -82,7 +82,8 @@ public class PrincipalPeopleStatisticsController {
         }else if( constant.QYRY.equals(roleCode)){
             String userId = sysUser.getId();
             idList.add(userId);
-        }else {
+        }
+        else {
             idList=null;
         }
             Page<PrincipalPeopleList> page = new Page<>(pageNo, pageSize);