添加窗口人员查询

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java

@@ -200,18 +200,22 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
     @Override
     public Rest<List<String>> getPerformMonthList(Context context) {
 
+
+        Set<String> collectSet = new HashSet<>();
+
         //查询所有窗口汇总表
         WindowPerformQuery windowPerformQuery = new WindowPerformQuery();
         windowPerformQuery.setOwnerId(context.getUser().getCustomerId());
         windowPerformQuery.setOrderColList(Arrays.asList(new OrderCol("year", OrderCol.DESCENDING), new OrderCol("month", OrderCol.DESCENDING)));
         Map<String, List<WindowPerformEntity>> collect = windowPerformService.find(windowPerformQuery).stream().collect(Collectors.groupingBy(item -> item.getYear() + "-" + item.getMonth()));
         Set<String> performMonthSet = collect.keySet();
+        collectSet.addAll(performMonthSet);
 
 //查询所有窗口人员汇总表
         WindowWorkmanPerformQuery windowWorkmanPerformQuery = new WindowWorkmanPerformQuery();
         windowWorkmanPerformQuery.setOwnerId(context.getUser().getCustomerId());
         Map<String, List<WindowWorkmanPerformEntity>> workmanMonthSet = windowWorkmanPerformService.find(windowWorkmanPerformQuery).stream().collect(Collectors.groupingBy(item -> item.getYear() + "-" + item.getMonth()));
-        performMonthSet.addAll(workmanMonthSet.keySet());
+        collectSet.addAll(workmanMonthSet.keySet());
 
         //perform 排序 降序
         List<String> dateList = performMonthSet.stream().collect(Collectors.toList());