From 618dbd17d89c739d37b943e880405fcb855e445d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 19 Nov 2024 09:48:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=E9=BB=98=E8=AE=A4=E5=80=BC=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=87=8D=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/setting/po/PageListSettingPO.java | 4 +--- src/com/engine/salary/service/impl/SettingServiceImpl.java | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/com/engine/salary/entity/setting/po/PageListSettingPO.java b/src/com/engine/salary/entity/setting/po/PageListSettingPO.java index 8b24728f6..c27bec6a3 100644 --- a/src/com/engine/salary/entity/setting/po/PageListSettingPO.java +++ b/src/com/engine/salary/entity/setting/po/PageListSettingPO.java @@ -10,13 +10,11 @@ import java.util.Collection; import java.util.Date; import java.util.List; -/** - * 薪资帐套表 - */ @Data @Builder @NoArgsConstructor @AllArgsConstructor +//hrsa_page_list_setting public class PageListSettingPO { @ElogTransform(name = "id") diff --git a/src/com/engine/salary/service/impl/SettingServiceImpl.java b/src/com/engine/salary/service/impl/SettingServiceImpl.java index 5c75551bc..485f6e24e 100644 --- a/src/com/engine/salary/service/impl/SettingServiceImpl.java +++ b/src/com/engine/salary/service/impl/SettingServiceImpl.java @@ -70,15 +70,16 @@ public class SettingServiceImpl extends Service implements SettingService { Date now = new Date(); PageListSettingPO pageListSettingPO = getPageListSettingMapper().getByPage(pageListSettingSaveParam.getPage()); + List checked = pageListSettingSaveParam.getSetting().stream().distinct().collect(Collectors.toList()); if (pageListSettingPO != null) { - pageListSettingPO.setSetting(pageListSettingSaveParam.getSetting()); + pageListSettingPO.setSetting(checked); pageListSettingPO.setUpdateTime(now); getPageListSettingMapper().updateIgnoreNull(pageListSettingPO); } else { pageListSettingPO = PageListSettingPO.builder() .id(IdGenerator.generate()) .page(pageListSettingSaveParam.getPage()) - .setting(pageListSettingSaveParam.getSetting()) + .setting(checked) .creator((long) user.getUID()) .createTime(now) .updateTime(now)