From 8caa3cb2b49c7df025968522a23cac4f6c069c6a Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 5 Jan 2026 15:47:30 +0800 Subject: [PATCH] =?UTF-8?q?5=E3=80=81=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97?= =?UTF-8?q?=E4=B8=AD=E7=BC=96=E8=BE=91=E8=B4=A6=E5=A5=97=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=9F=8E=E5=B8=82=EF=BC=9B=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=9F=8E=E5=B8=82=E4=B8=94=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=89=80=E6=9C=89=E5=9F=8E=E5=B8=82=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml | 2 +- .../engine/salary/service/impl/SalaryAcctRecordServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml index 2afe0c14a..e324ce2f0 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml @@ -136,7 +136,7 @@ - AND t.city IN + AND sob.city IN #{city} diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index aa252f80b..b3b99c9d6 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -235,7 +235,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe localDateRange.setEndDate(SalaryDateUtil.localDateToDate(queryParam.getEndMonth().atEndOfMonth())); } po.setSalaryMonths(localDateRange); - + po.setCityIds(queryParam.getCityIds()); // 查询薪资核算记录 List salaryAcctRecordPOS = getSalaryAcctRecordMapper().listSome(po); salaryAcctRecordPOS = getAuthService(user).auth(salaryAcctRecordPOS, AuthFilterTypeEnum.DATA_OPT, SalaryAcctRecordPO.class);