Merge branch 'staff-statistics' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/StaffStatisticsBiz.java

@@ -99,10 +99,10 @@ public class StaffStatisticsBiz {
                 Map<String, Map<Integer, Map<Integer, List<AppUserSellingWaterDTO>>>> userSellingWaterMap = sellingWaterMap.get(userStaffBo.getUserId());
                 if (userSellingWaterMap != null && !userSellingWaterMap.isEmpty()) {
                     AtomicReference<BigDecimal> royaltyAmountAtomicReference = new AtomicReference<>(BigDecimal.ZERO);
-                    List<String> postionNames = new ArrayList<>();
-                    List<Integer> postionIds = new ArrayList<>();
-                    List<String> companyNames = new ArrayList<>();
-                    List<Integer> compnayIds = new ArrayList<>();
+                    List<String> postionNames = new ArrayList<>(staffStatisticsBo.getPostionNames());
+                    List<Integer> postionIds = new ArrayList<>(staffStatisticsBo.getPostionIds());
+                    List<String> companyNames = new ArrayList<>(staffStatisticsBo.getCompanyNames());
+                    List<Integer> compnayIds = new ArrayList<>(staffStatisticsBo.getCompnayIds());
                     userSellingWaterMap.forEach((K, V) -> {
                         if (!K.equals(stateGroup)) {
                             String[] sates = K.split("-");
@@ -128,10 +128,6 @@ public class StaffStatisticsBiz {
                         }
                         wrapStaffStatistics(V, royaltyAmountAtomicReference, staffStatisticsBo);
                     });
-                    compnayIds.addAll(staffStatisticsBo.getCompnayIds());
-                    companyNames.addAll(staffStatisticsBo.getCompanyNames());
-                    postionIds.addAll(staffStatisticsBo.getCompnayIds());
-                    postionNames.addAll(staffStatisticsBo.getPostionNames());
                     staffStatisticsBo.setCompnayIds(compnayIds);
                     staffStatisticsBo.setCompanyNames(companyNames.stream().distinct().collect(Collectors.toList()));
                     staffStatisticsBo.setPostionIds(postionIds);