qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/2.17.1.2411.01' into release/2.17.1.2411.01

This commit is contained in:
Harryxzy 2024-11-19 10:03:09 +08:00
parent 05c0995841 618dbd17d8
commit 27b4e4c8fd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/entity/setting/po/PageListSettingPO.java
View File

@ -10,13 +10,11 @@ import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/**
* 薪资帐套表
*/
@Data @Data
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
//hrsa_page_list_setting
public class PageListSettingPO { public class PageListSettingPO {
@ElogTransform(name = "id") @ElogTransform(name = "id")

5
src/com/engine/salary/service/impl/SettingServiceImpl.java
View File

@ -70,15 +70,16 @@ public class SettingServiceImpl extends Service implements SettingService {
Date now = new Date(); Date now = new Date();
PageListSettingPO pageListSettingPO = getPageListSettingMapper().getByPage(pageListSettingSaveParam.getPage()); PageListSettingPO pageListSettingPO = getPageListSettingMapper().getByPage(pageListSettingSaveParam.getPage());
List<Long> checked = pageListSettingSaveParam.getSetting().stream().distinct().collect(Collectors.toList());
if (pageListSettingPO != null) { if (pageListSettingPO != null) {
pageListSettingPO.setSetting(pageListSettingSaveParam.getSetting()); pageListSettingPO.setSetting(checked);
pageListSettingPO.setUpdateTime(now); pageListSettingPO.setUpdateTime(now);
getPageListSettingMapper().updateIgnoreNull(pageListSettingPO); getPageListSettingMapper().updateIgnoreNull(pageListSettingPO);
} else { } else {
pageListSettingPO = PageListSettingPO.builder() pageListSettingPO = PageListSettingPO.builder()
.id(IdGenerator.generate()) .id(IdGenerator.generate())
.page(pageListSettingSaveParam.getPage()) .page(pageListSettingSaveParam.getPage())
.setting(pageListSettingSaveParam.getSetting()) .setting(checked)
.creator((long) user.getUID()) .creator((long) user.getUID())
.createTime(now) .createTime(now)
.updateTime(now) .updateTime(now)