diff --git a/src/com/engine/salary/entity/employeedeclare/dto/TaxAgentDeclareListDTO.java b/src/com/engine/salary/entity/employeedeclare/dto/TaxAgentDeclareListDTO.java
index 6b1286c03..a241b008e 100644
--- a/src/com/engine/salary/entity/employeedeclare/dto/TaxAgentDeclareListDTO.java
+++ b/src/com/engine/salary/entity/employeedeclare/dto/TaxAgentDeclareListDTO.java
@@ -6,6 +6,8 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
+import java.util.Set;
+
/**
* 浜哄憳鎶ラ侊紙涓◣鎵g即涔夊姟浜猴級鍒楄〃
* Copyright: Copyright (c) 2023
@@ -26,4 +28,6 @@ public class TaxAgentDeclareListDTO {
// 涓◣鎵g即涔夊姟浜
private String taxAgentName;
+
+ Set opts;
}
diff --git a/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java b/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java
index fca9ed934..9372a990a 100644
--- a/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java
+++ b/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java
@@ -11,8 +11,10 @@ import com.engine.salary.entity.employeedeclare.bo.EmployeeDeclareList;
import com.engine.salary.entity.employeedeclare.dto.*;
import com.engine.salary.entity.employeedeclare.param.*;
import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO;
+import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
import com.engine.salary.enums.SalaryOnOffEnum;
+import com.engine.salary.enums.auth.AuthFilterTypeEnum;
import com.engine.salary.enums.employeedeclare.*;
import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum;
import com.engine.salary.exception.SalaryRunTimeException;
@@ -28,6 +30,7 @@ import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.ValidUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import com.weaver.util.threadPool.ThreadPoolUtil;
import com.weaver.util.threadPool.constant.ModulePoolEnum;
import com.weaver.util.threadPool.entity.LocalRunnable;
@@ -83,24 +86,21 @@ public class EmployeeDeclareWrapper extends Service {
* @return
*/
public PageInfo taxAgentDeclareList(TaxAgentDeclareListQueryParam queryParam) {
- // 鍒ゆ柇鏄惁鏄滄荤鐞嗗憳鈥
- Boolean isChief = getTaxAgentService(user).isChief(Long.valueOf(user.getUID()));
- // 鏄惁寮鍚垎鏉
- Boolean openDevolution = getTaxAgentService(user).isOpenDevolution();
- // 鏌ヨ涓◣鎵g即涔夊姟浜
- List taxAgents = Lists.newArrayList();
- if (!openDevolution || isChief) {
- taxAgents = getTaxAgentService(user).listAll();
- } else {
- taxAgents = new ArrayList<>(getTaxAgentService(user).listAllTaxAgentsAsAdmin(Long.valueOf(user.getUID())));
- }
+ TaxAgentQueryParam param = TaxAgentQueryParam.builder().build();
+ param.setFilterType(AuthFilterTypeEnum.QUERY_DATA);
+ List taxAgents = getTaxAgentService(user).listAuth(param);
+
if (StringUtils.isNotEmpty(queryParam.getTaxAgentName())) {
taxAgents = taxAgents.stream().filter(e -> StringUtils.contains(e.getName(), queryParam.getTaxAgentName())).collect(Collectors.toList());
}
// 鍒嗛〉
List dtoList = Lists.newArrayList();
for (TaxAgentPO taxAgent : taxAgents) {
- TaxAgentDeclareListDTO dto = new TaxAgentDeclareListDTO().setId(taxAgent.getId()).setTaxAgentName(taxAgent.getName());
+ TaxAgentDeclareListDTO dto = TaxAgentDeclareListDTO.builder()
+ .id(taxAgent.getId())
+ .taxAgentName(taxAgent.getName())
+ .opts(Sets.newHashSet("admin"))
+ .build();
dtoList.add(dto);
}
return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), dtoList, TaxAgentDeclareListDTO.class);
@@ -122,14 +122,6 @@ public class EmployeeDeclareWrapper extends Service {
List convert = getEmployeeDeclareService(user).convert(employeeDeclarePOS);
pageInfo.setList(convert);
-// // 鍒ゆ柇鏄惁寮鍚垎閮
-// boolean subcompanySupport = hrmConfigSetCache.isSubcompanySupport(tenantKey);
-// if (!subcompanySupport) {
-// weaTable.getColumns().stream()
-// .filter(e -> Objects.equals(e.getDataIndex(), "subCompanyName"))
-// .findAny()
-// .ifPresent(weaTableColumn -> weaTableColumn.setHide(true));
-// }
SalaryWeaTable table = new SalaryWeaTable<>(user, EmployeeDeclareListDTO.class);
WeaResultMsg result = new WeaResultMsg(false);
result.putAll(table.makeDataResult());