From 22077f431e75dcec2b311120a2cf7c9aed4bf99b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 17 Feb 2025 09:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaxAgentServiceImpl.java     | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
index 5443c1b45..0051bd7b8 100644
--- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
@@ -313,21 +313,9 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
 
     @Override
     public Collection<TaxAgentPO> listAllTaxAgentsAsAdmin(Long employeeId) {
-        List<TaxAgentPO> taxAgents = getTaxAgentMapper().listAll();
-        // 是否开启分权
-        boolean isOpenDevolution = getTaxAgentBaseService(user).isOpenDevolution();
-        if (!isOpenDevolution) {
-            return taxAgents;
-        }
-        List<Long> taxAgentIds = taxAgents.stream().map(TaxAgentPO::getId).collect(Collectors.toList());
-        List<Long> enableTaxAgentIds = Lists.newArrayList();
-        // 1.判断自己是否是管理员， 如果是管理员，就是能够查看所属个税扣缴义务人
-        List<TaxAgentAdminPO> taxAgentAdminList = getTaxAgentAdminService(user).listByTaxAgentIds(taxAgentIds);
-        // 是管理员的列表
-        List<Long> adminTaxAgentIds = taxAgentAdminList.stream().filter(f -> f.getEmployeeId().equals(employeeId)).map(TaxAgentAdminPO::getTaxAgentId).collect(Collectors.toList());
-
-        enableTaxAgentIds.addAll(adminTaxAgentIds);
-        return taxAgents.stream().filter(f -> enableTaxAgentIds.contains(f.getId())).collect(Collectors.toList());
+        TaxAgentQueryParam param = TaxAgentQueryParam.builder().build();
+        param.setFilterType(AuthFilterTypeEnum.ADMIN_DATA);
+        return listAuth(param);
     }
 
     @Override
@@ -493,8 +481,6 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
         }
         // 删除管理员
         getTaxAgentAdminService(user).deleteByTaxAgentIds(ids);
-        // 删除分管理员和对应管理范围
-//     todo   taxAgentSubAdminService.deleteByTaxAgentIds(ids);
         // 删除人员范围
         getTaxAgentManageRangeService(user).deleteByTaxAgentIds(ids);