From 8a6b076ea98ef72a3a19ef2c6962653bed3f5890 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 10:58:53 +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
---
.../window/service/impl/WindowOwnerServiceImpl.java | 10 +++++++---
.../com/mortals/xhx/common/pdu/window/WindowPdu.java | 8 +++++++-
2 files changed, 14 insertions(+), 4 deletions(-)
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 2c935cdf..ace5b5bd 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
@@ -65,8 +65,9 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
@Override
public List<WindowPdu> subWindowPduList(WindowPdu pdu) {
- List<WindowPdu> subList = new ArrayList<>();
List<WindowPdu> ownerList = new ArrayList<>();
+ List<WindowPdu> subList = new ArrayList<>();
+ List<WindowPdu> subTwoList = new ArrayList<>();
List<WindowOwnerDetailEntity> ownerDetail = windowOwnerDetailService.getAllList();
if (!CollectionUtils.isEmpty(ownerDetail)) {
Long[] windows = ownerDetail.stream().map(WindowOwnerDetailEntity::getWindowId).toArray(Long[]::new);
@@ -91,13 +92,16 @@ 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()) {
- ownerList = ownerRest.getData().getData();
+ ownerRest.getData().getData().stream().forEach(item->{
+ item.setSelected(YesNoEnum.YES.getValue());
+ });
+ subTwoList = ownerRest.getData().getData();
}
}
}
}
-
ownerList.addAll(subList);
+ ownerList.addAll(subTwoList);
return ownerList;
}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/window/WindowPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/window/WindowPdu.java
index 5811e4c8..27490652 100644
--- a/common-lib/src/main/java/com/mortals/xhx/common/pdu/window/WindowPdu.java
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/window/WindowPdu.java
@@ -94,9 +94,15 @@ public class WindowPdu extends BaseEntityLong {
*/
private String hallName;
- /** 搴忓彿锛屼富閿紝鑷闀挎帓闄ゅ垪琛� */
+ /**
+ * 搴忓彿锛屼富閿紝鑷闀挎帓闄ゅ垪琛�
+ */
private List<Long> idNotList;
private List<Long> idList;
+ /**
+ * 0鏈€変腑 1閫変腑 榛樿涓�0
+ */
+ private Integer selected = 0;
}
--
2.24.3