From 932ea6bedd134faa81174a8e387b775998684928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 29 Aug 2024 14:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=92=8C=E8=B4=A6=E5=A5=97?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/entity/salaryacct/po/SalaryAcctRecordPO.java  | 6 +++++-
 .../salary/service/impl/SalaryAcctRecordServiceImpl.java | 3 ++-
 .../engine/salary/wrapper/SalaryAcctResultWrapper.java   | 9 +++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

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<Long> lockSalaryItemIds;
 
+
+    private Set<String> opts;
+
     //查询条件-------------------------------
     Collection<Long> 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<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(),
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;
     }
 
     /**