Skip to content

C
cloud-platform
Commit 0e2f7d55 authored by libin's avatar libin
Browse files
Options

Merge branch 'staff-statistics' into dev

parents 1d72d440 1595a79d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/StaffStatisticsBiz.java
View file @ 0e2f7d55
...@@ -225,7 +225,7 @@ public class StaffStatisticsBiz { ...@@ -225,7 +225,7 @@ public class StaffStatisticsBiz {
if (staffStatisticsFindDTO.getPage() == 1) { if (staffStatisticsFindDTO.getPage() == 1) {
List<UserStaffBo> userStaffBos = appUserDetailBiz.findStaffsByIdsAndCompanyAndPostion(staffStatisticsFindDTO); List<UserStaffBo> userStaffBos = appUserDetailBiz.findStaffsByIdsAndCompanyAndPostion(staffStatisticsFindDTO);
List<StaffStatisticsBo> totalStaffStatisticsBos = processStaffStatistics(userStaffBos, staffStatisticsFindDTO); List<StaffStatisticsBo> totalStaffStatisticsBos = processStaffStatistics(userStaffBos, staffStatisticsFindDTO);
StaffStatisticsTotalBo staffStatisticsTotalBo = getStaffStatisticsTotalBo(allStaffs.size(), totalStaffStatisticsBos); StaffStatisticsTotalBo staffStatisticsTotalBo = getStaffStatisticsTotalBo(userStaffBos.size(), totalStaffStatisticsBos);
result.put(TOTAL_VAL, staffStatisticsTotalBo); result.put(TOTAL_VAL, staffStatisticsTotalBo);
} }
pageDataVO.setData(staffStatisticsBos); pageDataVO.setData(staffStatisticsBos);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment