From bdd9b5aa07c8604fe9aa9dd4ef9193b465ce7b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 22 Aug 2022 10:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B3=E6=8A=A5=E6=97=B6?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=95=B0=E9=87=8F=E5=92=8C=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TaxDeclarationDetailServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java index 7deeb9e5a..0f6e290f6 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java @@ -196,15 +196,15 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla Boolean openDevolution = getTaxAgentService(user).isOpenDevolution(); // 是否是总管理员 Boolean isChief = getTaxAgentService(user).isChief((long) user.getUID()); - if (BooleanUtils.isTrue(openDevolution) && !isChief) { - List taxDeclarationEmployeeDTOS = getTaxDeclarationDetailMapper().list4EmployeeId(queryParam.getTaxDeclarationId()); - // 根据权限过滤 - taxDeclarationEmployeeDTOS = filterByAuthority(taxDeclarationPO, taxDeclarationEmployeeDTOS); - employeeIdPage.setTotal(taxDeclarationEmployeeDTOS.size()); - employeeIdPage.setList(SalaryPageUtil.subList((int) employeeIdPage.getPageNum(), (int) employeeIdPage.getPageSize(), taxDeclarationEmployeeDTOS)); - } else { - employeeIdPage = listPage4EmployeeIdByParam(queryParam); - } +// if (BooleanUtils.isTrue(openDevolution) && !isChief) { +// List taxDeclarationEmployeeDTOS = getTaxDeclarationDetailMapper().list4EmployeeId(queryParam.getTaxDeclarationId()); +// // 根据权限过滤 +// taxDeclarationEmployeeDTOS = filterByAuthority(taxDeclarationPO, taxDeclarationEmployeeDTOS); +// employeeIdPage.setTotal(taxDeclarationEmployeeDTOS.size()); +// employeeIdPage.setList(SalaryPageUtil.subList((int) employeeIdPage.getPageNum(), (int) employeeIdPage.getPageSize(), taxDeclarationEmployeeDTOS)); +// } else { + employeeIdPage = listPage4EmployeeIdByParam(queryParam); +// } PageInfo dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), TaxDeclarationWageListDTO.class); dtoPage.setTotal(employeeIdPage.getTotal()); if (CollectionUtils.isNotEmpty(employeeIdPage.getList())) {