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 pageList3 = payWorkingGroupService.queryPageListForCompanyFirstPage(); List pageList4 = payWorkingGroupService.queryPageListForDepartFirstPage(); HashMap 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 page = new Page<>(pageNo, pageSize);