diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java index b79149181..ee2c69ad6 100644 --- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java +++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java @@ -1,8 +1,8 @@ package com.engine.salary.entity.salaryacct.po; +import com.engine.hrmelog.annotation.ElogTransform; import com.engine.salary.annotation.Auth; import com.engine.salary.common.LocalDateRange; -import com.engine.hrmelog.annotation.ElogTransform; import com.engine.salary.enums.auth.AuthCheckTypeEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import lombok.AllArgsConstructor; @@ -14,6 +14,7 @@ import lombok.experimental.Accessors; import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Set; /** * 薪资核算表 @@ -133,6 +134,9 @@ public class SalaryAcctRecordPO { */ private List lockSalaryItemIds; + + private Set opts; + //查询条件------------------------------- Collection ids; diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index 7f2f1fe6f..89fad2ab7 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -16,6 +16,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.enums.OperateTypeEnum; +import com.engine.salary.enums.auth.AuthFilterTypeEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import com.engine.salary.exception.SalaryRunTimeException; @@ -210,7 +211,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算记录 List salaryAcctRecordPOS = getSalaryAcctRecordMapper().listSome(po); -// List auth = getAuthService(user).auth(salaryAcctRecordPOS, AuthFilterTypeEnum.DATA_OPT, SalaryAcctRecordPO.class); + salaryAcctRecordPOS = getAuthService(user).auth(salaryAcctRecordPOS, AuthFilterTypeEnum.DATA_OPT, SalaryAcctRecordPO.class); return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java index cae703b1c..126d5c6d1 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java @@ -252,10 +252,11 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult * @param salaryAcctRecordId */ public Boolean checkAuth(Long salaryAcctRecordId) { - if(Objects.isNull(salaryAcctRecordId)){ - return false; - } - return getSalaryAcctResultService(user).checkAuth(salaryAcctRecordId); +// if(Objects.isNull(salaryAcctRecordId)){ +// return false; +// } +// return getSalaryAcctResultService(user).checkAuth(salaryAcctRecordId); + return true; } /**