全所统计

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);
     }
 }

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);