qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

核算和账套的权限

This commit is contained in:
钱涛 2024-08-29 14:47:33 +08:00
parent 3721867723
commit 932ea6bedd
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
View File

@ -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<Long> lockSalaryItemIds;
private Set<String> opts;
//查询条件-------------------------------
Collection<Long> ids;

3
src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
View File

@ -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<SalaryAcctRecordPO> salaryAcctRecordPOS = getSalaryAcctRecordMapper().listSome(po);
// List<SalaryAcctRecordPO> 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(),

9
src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
View File

@ -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;
}
/**