Merge branch 'staff-statistics' into dev

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

@@ -99,16 +99,16 @@ 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<>();
                     userSellingWaterMap.forEach((K, V) -> {
                         if (!K.equals(stateGroup)) {
                             String[] sates = K.split("-");
                             String postionIdStr = sates[1];
                             postionMap.get(Integer.valueOf(postionIdStr));
                             String companyIdStr = sates[2];
-                            List<String> postionNames = staffStatisticsBo.getPostionNames();
-                            List<Integer> postionIds = staffStatisticsBo.getPostionIds();
-                            List<String> companyNames = staffStatisticsBo.getCompanyNames();
-                            List<Integer> compnayIds = staffStatisticsBo.getCompnayIds();
                             if (!postionIds.contains(Integer.valueOf(postionIdStr))) {
                                 postionNames.add(postionMap.get(Integer.valueOf(postionIdStr)));
                                 postionIds.add(Integer.valueOf(postionIdStr));
@@ -128,6 +128,14 @@ 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);
+                    staffStatisticsBo.setPostionNames(postionNames.stream().distinct().collect(Collectors.toList()));
                     staffStatisticsBo.setRoyaltyAmount(royaltyAmountAtomicReference.get());
                 }
             }