添加窗口编码

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

@@ -92,7 +92,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
                     ownerWindowPdu.setIdList(Arrays.asList(windowIds));
                     Rest<RespData<List<WindowPdu>>> ownerRest = windowFeign.list(ownerWindowPdu);
                     if (ownerRest.getCode() == YesNoEnum.YES.getValue()) {
-                        ownerRest.getData().getData().stream().forEach(item->{
+                        ownerRest.getData().getData().stream().forEach(item -> {
                             item.setSelected(YesNoEnum.YES.getValue());
                         });
                         subTwoList = ownerRest.getData().getData();
@@ -102,6 +102,12 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
         }
         ownerList.addAll(subList);
         ownerList.addAll(subTwoList);
+
+        if (!ObjectUtils.isEmpty(pdu.getHallId())) {
+            ownerList = ownerList.stream().filter(f -> pdu.getHallId().equals(f.getHallId())).collect(Collectors.toList());
+        }
+
+
         return ownerList;
     }