5、薪资账套中编辑账套增加所属城市;薪资核算页面中增加所属城市且可以通过所有城市进行筛选
This commit is contained in:
parent
c35b323736
commit
8caa3cb2b4
|
|
@ -136,7 +136,7 @@
|
|||
</foreach>
|
||||
</if>
|
||||
<if test="cityIds != null and cityIds.size()>0">
|
||||
AND t.city IN
|
||||
AND sob.city IN
|
||||
<foreach collection="cityIds" open="(" item="city" separator="," close=")">
|
||||
#{city}
|
||||
</foreach>
|
||||
|
|
|
|||
|
|
@ -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<SalaryAcctRecordPO> salaryAcctRecordPOS = getSalaryAcctRecordMapper().listSome(po);
|
||||
salaryAcctRecordPOS = getAuthService(user).auth(salaryAcctRecordPOS, AuthFilterTypeEnum.DATA_OPT, SalaryAcctRecordPO.class);
|
||||
|
|
|
|||
Loading…
Reference in New Issue