From db9a0e22eb005bbc6e9f447933dc991e88f29cb9 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 18 Jul 2023 17:00:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE-=E6=A0=B8?= =?UTF-8?q?=E7=AE=97=E6=97=B6=E9=9A=90=E8=97=8Ffixbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryitem/dto/SalaryItemSobListDTO.java | 4 ++-- .../engine/salary/entity/salarysob/bo/SalarySobItemBO.java | 4 ++-- src/com/engine/salary/wrapper/SalarySobItemWrapper.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java index 799570c95..78bc4a84f 100644 --- a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java +++ b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java @@ -50,8 +50,8 @@ public class SalaryItemSobListDTO { private Integer useDefault; //核算时默认隐藏 - @SalaryTableColumn(text = "默认隐藏", width = "10%", column = "useDefault") - @TableTitle(title = "默认隐藏",dataIndex = "useDefault",key = "useDefault") + @SalaryTableColumn(text = "默认隐藏", width = "10%", column = "hideDefault") + @TableTitle(title = "默认隐藏",dataIndex = "hideDefault",key = "hideDefault") private Integer hideDefault; //进位规则 diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java index 314dc4c5e..3e2513908 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java @@ -134,7 +134,7 @@ public class SalarySobItemBO { .salarySobId(salarySobId) .salaryItemId(salaryItemPO.getId()) .isGroup(0) - .itemHide(Long.valueOf(salaryItemPO.getHideDefault())) + .itemHide(Long.valueOf(salaryItemPO.getHideDefault()== null ? 0 : salaryItemPO.getHideDefault())) .creator(employeeId) .createTime(now) .updateTime(now) @@ -173,7 +173,7 @@ public class SalarySobItemBO { .salarySobId(salarySobId) .salaryItemId(salaryItemPO.getId()) .isGroup(0) - .itemHide(Long.valueOf(salaryItemPO.getHideDefault())) + .itemHide(Long.valueOf(salaryItemPO.getHideDefault() == null ? 0 : salaryItemPO.getHideDefault())) .creator(employeeId) .createTime(now) .updateTime(now) diff --git a/src/com/engine/salary/wrapper/SalarySobItemWrapper.java b/src/com/engine/salary/wrapper/SalarySobItemWrapper.java index 2400f224b..096d9a395 100644 --- a/src/com/engine/salary/wrapper/SalarySobItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySobItemWrapper.java @@ -96,7 +96,7 @@ public class SalarySobItemWrapper extends Service { } }) .collect(Collectors.toList()); - SalaryPageUtil.buildPage(searchCurrent, searchPageSize, salaryItemList); + salaryItemList = SalaryPageUtil.buildPage(searchCurrent, searchPageSize, salaryItemList).getList(); //最终返回的分页对象 PageInfo dtoPage = new PageInfo<>(SalaryItemSobListDTO.class);