From 30f3f48cc8d87dc1c527d6a89ab9be9db09a907c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Mon, 29 Jan 2024 12:42:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AA=97=E5=8F=A3=E7=BC=96?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/WindowOwnerServiceImpl.java | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java
index dada9784..68a6077b 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java
@@ -104,7 +104,7 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
ownerList.addAll(subTwoList);
if (!ObjectUtils.isEmpty(pdu.getHallId())) {
- ownerList = ownerList.stream().sorted(Comparator.comparing(WindowPdu::getSelected).reversed()).filter(f -> pdu.getHallId().equals(f.getHallId())).collect(Collectors.toList());
+ ownerList = ownerList.stream().sorted(Comparator.comparing(WindowPdu::getSelected)).filter(f -> pdu.getHallId().equals(f.getHallId())).collect(Collectors.toList());
}
@@ -237,4 +237,20 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
}
+ @Override
+ protected void removeBefore(Long[] ids, Context context) throws AppException {
+ super.removeBefore(ids, context);
+ //鍒犻櫎绐楀彛浜哄憳
+ List<WindowOwnerEntity> windowOwnerEntities = this.get(ids, context);
+ List<Long> collect = windowOwnerEntities.stream().map(item -> item.getWindowId()).collect(Collectors.toList());
+ if (!ObjectUtils.isEmpty(collect)) {
+ WindowOwnerDetailQuery detailQuery = new WindowOwnerDetailQuery();
+ detailQuery.ownerIdList(collect);
+ Long[] delIds = windowOwnerDetailService.find(detailQuery).stream().map(item -> item.getId()).toArray(Long[]::new);
+ if (!ObjectUtils.isEmpty(delIds)) {
+ windowOwnerDetailService.remove(delIds, context);
+ }
+ }
+
+ }
}
\ No newline at end of file
--
2.24.3