diff --git a/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java index 42ce2c5bf..f1075d4ab 100644 --- a/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java +++ b/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java @@ -33,7 +33,6 @@ public class AuthRoleSaveParam { /** * 扣缴义务人资源 */ - @DataCheck(require = true, message = "扣缴义务人不允许为空") private List taxAgentIds; diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java index e8811bf3f..e71a6e449 100644 --- a/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java +++ b/src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java @@ -5,12 +5,13 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * @description: 薪资账套列表查询参数 - * @author: xiajun - * @modified By: xiajun - * @date: Created in 1/18/22 3:04 PM - * @version:v1.0 - */ + * 账套查询 + *

Copyright: Copyright (c) 2024

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @EqualsAndHashCode(callSuper = true) public class SalarySobListQueryParam extends BaseQueryParam { diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java index 92688dfde..52c32eb89 100644 --- a/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java +++ b/src/com/engine/salary/entity/salarysob/param/SalarySobQueryParam.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.salarysob.param; import com.engine.salary.common.BaseQueryParam; +import com.engine.salary.enums.auth.AuthFilterTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,9 +10,18 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class SalarySobQueryParam extends BaseQueryParam { - //薪资账套名称") + /** + * 名称 + */ private String name; - // 薪资账套id + /** + * 扣缴义务人id + */ private Long taxAgentId; + + /** + * 数据过滤级别 + */ + private AuthFilterTypeEnum filterType; } diff --git a/src/com/engine/salary/entity/taxagent/param/TaxAgentQueryParam.java b/src/com/engine/salary/entity/taxagent/param/TaxAgentQueryParam.java index 410b0b2b4..a8663b5cd 100644 --- a/src/com/engine/salary/entity/taxagent/param/TaxAgentQueryParam.java +++ b/src/com/engine/salary/entity/taxagent/param/TaxAgentQueryParam.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.taxagent.param; import com.engine.salary.common.BaseQueryParam; +import com.engine.salary.enums.auth.AuthFilterTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,4 +27,9 @@ public class TaxAgentQueryParam extends BaseQueryParam { //个税扣缴义务人名称 private String name; + + /** + * 数据过滤级别 + */ + private AuthFilterTypeEnum filterType; } diff --git a/src/com/engine/salary/enums/auth/AuthFilterTypeEnum.java b/src/com/engine/salary/enums/auth/AuthFilterTypeEnum.java index 752a8944c..166783cce 100644 --- a/src/com/engine/salary/enums/auth/AuthFilterTypeEnum.java +++ b/src/com/engine/salary/enums/auth/AuthFilterTypeEnum.java @@ -16,7 +16,8 @@ import java.util.Objects; public enum AuthFilterTypeEnum implements BaseEnum { DATA_OPT("DATA_OPT", "数据&功能权限", 87626), - ONLY_DATA("ONLY_DATA", "仅数据权限", 87627); + QUERY_DATA("QUERY_DATA", "获取可查询数据", 87627), + ADMIN_DATA("ADMIN_DATA", "获取可管理数据", 87627); // ONLY_OPT("ONLY_OPT", "仅功能权限", 87626) ; diff --git a/src/com/engine/salary/service/SalarySobService.java b/src/com/engine/salary/service/SalarySobService.java index 665fc7099..7d0596097 100644 --- a/src/com/engine/salary/service/SalarySobService.java +++ b/src/com/engine/salary/service/SalarySobService.java @@ -64,7 +64,7 @@ public interface SalarySobService { List listAll(); - List listAllByAuth(); + List listAuth(SalarySobQueryParam param); /** * 获取拥有管理权限的账套 diff --git a/src/com/engine/salary/service/TaxAgentService.java b/src/com/engine/salary/service/TaxAgentService.java index 188f2d911..f6df75965 100644 --- a/src/com/engine/salary/service/TaxAgentService.java +++ b/src/com/engine/salary/service/TaxAgentService.java @@ -107,6 +107,8 @@ public interface TaxAgentService { */ List listAll(); + List listAuth(TaxAgentQueryParam taxAgentQueryParam); + /** * 根据id获取单个个税扣缴义务人 * @@ -128,7 +130,7 @@ public interface TaxAgentService { * @param currentEmployeeId 当前登录人id * @return */ - Collection listAllTaxAgents(Long currentEmployeeId); + List listAllTaxAgents(Long currentEmployeeId); /** * 获取作为管理员的所有个税扣缴义务人列表 diff --git a/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java b/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java index a65125557..1ac54bf8b 100644 --- a/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java @@ -63,15 +63,15 @@ public class AuthRoleServiceImpl extends Service implements AuthRoleService { List authRoleEmpDTOS = getAuthMemberService(user).listRoleEmp(roleId); List authOptPOS = getAuthOptService(user).listOpts(roleId); List authRoleDataDTOS = getAuthDataService(user).listRoleData(roleId); + List authResources = getAuthResourceMapper().listSome(AuthResourcePO.builder().roleId(roleId).build()); return AuthRoleDTO.builder().id(roleId) .name(po.getName()) .members(authRoleEmpDTOS.size()) .opts(authOptPOS.size()) .datas(authRoleDataDTOS.size()) - .resources(0) + .resources(authResources.size()) .build(); - }).collect(Collectors.toList()); PageInfo pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), collect, AuthRoleDTO.class); pageInfo.setTotal(total); diff --git a/src/com/engine/salary/service/auth/AuthServiceImpl.java b/src/com/engine/salary/service/auth/AuthServiceImpl.java index 7f6c966fa..2d0e70dfa 100644 --- a/src/com/engine/salary/service/auth/AuthServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthServiceImpl.java @@ -176,8 +176,8 @@ public class AuthServiceImpl extends Service implements AuthService { List orDefault = authMap.getOrDefault(taxAgentId, new ArrayList<>()); Map> optsMap = SalaryEntityUtil.convert2Map(orDefault, EmpOpt::getEmployeeId, EmpOpt::getOpts); if (optsMap.containsKey(employeeId)) { + Set optSets = optsMap.getOrDefault(employeeId, new HashSet<>()); if (filterType == AuthFilterTypeEnum.DATA_OPT) { - Set optSets = optsMap.getOrDefault(employeeId, new HashSet<>()); Method optsFieldGetterMethod = t.getClass().getMethod(optsFieldGetter); Set opts = (Set) optsFieldGetterMethod.invoke(t); if (opts == null) { @@ -187,8 +187,16 @@ public class AuthServiceImpl extends Service implements AuthService { Method optsFieldSetterMethod = t.getClass().getMethod(optsFieldSetter, Set.class); optsFieldSetterMethod.invoke(t, opts); + resultList.add(t); + } + if (filterType == AuthFilterTypeEnum.QUERY_DATA) { + resultList.add(t); + } + if (filterType == AuthFilterTypeEnum.ADMIN_DATA) { + if (optSets.contains("admin")) { + resultList.add(t); + } } - resultList.add(t); } } } @@ -201,8 +209,8 @@ public class AuthServiceImpl extends Service implements AuthService { Long sobId = (Long) sobIdFieldGetterMethod.invoke(t); if (sobOpts.containsKey(sobId)) { + Set optSets = sobOpts.getOrDefault(sobId, new HashSet<>()); if (filterType == AuthFilterTypeEnum.DATA_OPT) { - Set optSets = sobOpts.getOrDefault(sobId, new HashSet<>()); Method optsFieldGetterMethod = t.getClass().getMethod(optsFieldGetter); Set opts = (Set) optsFieldGetterMethod.invoke(t); if (opts == null) { @@ -212,8 +220,16 @@ public class AuthServiceImpl extends Service implements AuthService { Method optsFieldSetterMethod = t.getClass().getMethod(optsFieldSetter, Set.class); optsFieldSetterMethod.invoke(t, opts); + resultList.add(t); + } + if (filterType == AuthFilterTypeEnum.QUERY_DATA) { + resultList.add(t); + } + if (filterType == AuthFilterTypeEnum.ADMIN_DATA) { + if (optSets.contains("admin")) { + resultList.add(t); + } } - resultList.add(t); } } } else if (checkType == AuthCheckTypeEnum.TAX) { @@ -226,8 +242,8 @@ public class AuthServiceImpl extends Service implements AuthService { Long taxAgentId = (Long) taxAgentIdFieldGetterMethod.invoke(t); if (taxOpts.containsKey(taxAgentId)) { + Set optSets = taxOpts.getOrDefault(taxAgentId, new HashSet<>()); if (filterType == AuthFilterTypeEnum.DATA_OPT) { - Set optSets = taxOpts.getOrDefault(taxAgentId, new HashSet<>()); Method optsFieldGetterMethod = t.getClass().getMethod(optsFieldGetter); Set opts = (Set) optsFieldGetterMethod.invoke(t); if (opts == null) { @@ -237,9 +253,16 @@ public class AuthServiceImpl extends Service implements AuthService { Method optsFieldSetterMethod = t.getClass().getMethod(optsFieldSetter, Set.class); optsFieldSetterMethod.invoke(t, opts); - + resultList.add(t); + } + if (filterType == AuthFilterTypeEnum.QUERY_DATA) { + resultList.add(t); + } + if (filterType == AuthFilterTypeEnum.ADMIN_DATA) { + if (optSets.contains("admin")) { + resultList.add(t); + } } - resultList.add(t); } } } diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 665ce3a76..7efe48768 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -1070,7 +1070,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe List list = getSalaryArchiveMapper().listAll(); - list = getAuthService(user).auth(list,AuthFilterTypeEnum.ONLY_DATA,SalaryArchivePO.class); + list = getAuthService(user).auth(list,AuthFilterTypeEnum.QUERY_DATA,SalaryArchivePO.class); long pendingTotal = 0L; long fixedTotal = 0L; diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java index fe5358ff2..bea398499 100644 --- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java @@ -20,7 +20,6 @@ import com.engine.salary.entity.salarysob.param.*; import com.engine.salary.entity.salarysob.po.*; import com.engine.salary.entity.taxagent.po.TaxAgentExtRangePO; import com.engine.salary.entity.taxagent.po.TaxAgentManageRangePO; -import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.SalarySystemTypeEnum; import com.engine.salary.enums.auth.AuthFilterTypeEnum; @@ -216,23 +215,27 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { } @Override - public List listAllByAuth() { - long uid = user.getUID(); - boolean isChief = getTaxAgentService(user).isChief(uid); - if (isChief) { - // 薪酬总管理员能看到所有数据 - return listAll(); + public List listAuth(SalarySobQueryParam param) { + // 开启分权后需要过滤薪资账套 + String name = param.getName(); + // 查询所有的薪资账套 + SalarySobPO build = SalarySobPO.builder().build(); + if (StringUtils.isNotBlank(name)) { + build.setName(name); } - Collection canManageTaxAgentList = getTaxAgentService(user).listAllTaxAgentsAsAdmin(uid); - List taxAgentIds = canManageTaxAgentList.stream().map(TaxAgentPO::getId).collect(Collectors.toList()); - List salarySobPOS = listByTaxAgentIds(taxAgentIds); - return salarySobPOS; + if (param.getTaxAgentId() != null) { + List sobTaxLinkPOS = getSobTaxLinkMapper().listSome(SobTaxLinkPO.builder().taxAgentId(param.getTaxAgentId()).build()); + build.setIds(sobTaxLinkPOS.stream().map(SobTaxLinkPO::getTaxAgentId).collect(Collectors.toList())); + } + + List list = getSalarySobMapper().listSome(build); + return getAuthService(user).auth(list, param.getFilterType(), SalarySobPO.class); } @Override public List listByAdmin() { List salarySobPOS = salarySobMapper.listSome(SalarySobPO.builder().build()); - return getAuthService(user).auth(salarySobPOS, AuthFilterTypeEnum.ONLY_DATA, SalarySobPO.class); + return getAuthService(user).auth(salarySobPOS, AuthFilterTypeEnum.QUERY_DATA, SalarySobPO.class); } @Override diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java index 36b78998f..6128fa729 100644 --- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java @@ -29,6 +29,7 @@ import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam; import com.engine.salary.entity.taxagent.param.TaxAgentSaveParam; import com.engine.salary.entity.taxagent.po.*; import com.engine.salary.enums.OperateTypeEnum; +import com.engine.salary.enums.auth.AuthFilterTypeEnum; import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum; @@ -279,6 +280,13 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { return getTaxAgentMapper().listAll(); } + @Override + public List listAuth(TaxAgentQueryParam queryParam) { + List taxAgents = getTaxAgentMapper().listBySome(queryParam); + AuthFilterTypeEnum filterType = queryParam.getFilterType(); + return handleForDevolution(taxAgents, (long) user.getUID(), filterType == AuthFilterTypeEnum.QUERY_DATA); + } + @Override public TaxAgentPO getById(Long id) { return getTaxAgentMapper().getById(id); @@ -291,7 +299,7 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { } @Override - public Collection listAllTaxAgents(Long employeeId) { + public List listAllTaxAgents(Long employeeId) { List taxAgents = getTaxAgentMapper().listAll(); return handleForDevolution(taxAgents, employeeId, true); } diff --git a/src/com/engine/salary/web/SalarySobController.java b/src/com/engine/salary/web/SalarySobController.java index 026ff516d..6592c607c 100644 --- a/src/com/engine/salary/web/SalarySobController.java +++ b/src/com/engine/salary/web/SalarySobController.java @@ -88,7 +88,7 @@ public class SalarySobController { } /** - * 薪资账套列表 + * 根据扣缴义务人查询 */ @POST @Path("/listByTaxAgent") @@ -114,11 +114,11 @@ public class SalarySobController { * 薪资账套列表(分权) */ @POST - @Path("/listAllByAuth") + @Path("/listAuth") @Produces(MediaType.APPLICATION_JSON) - public String listAllByAuth(@Context HttpServletRequest request, @Context HttpServletResponse response) { + public String listAllByAuth(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySobQueryParam queryParam) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult>(user).run(getSalarySobWrapper(user)::listAllByAuth); + return new ResponseResult>(user).run(getSalarySobWrapper(user)::listAuth,queryParam); } @@ -282,13 +282,13 @@ public class SalarySobController { public Response downloadSobRangeTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "salarySobId") Long salarySobId) { User user = HrmUserVarify.getUser(request, response); SalarySobPO salarySobPO = Objects.isNull(salarySobId) ? null : getSalarySobWrapper(user).getSalarySobService(user).getById(salarySobId); - if(Objects.isNull(salarySobPO)){ + if (Objects.isNull(salarySobPO)) { throw new SalaryRunTimeException("薪资账套不存在或已被删除"); } try { XSSFWorkbook workbook = getSalarySobRangeWrapper(user).exportImportTemplate(); String time = LocalDate.now().toString(); - String fileName = salarySobPO.getName() + "人员范围导入模板" + time ; + String fileName = salarySobPO.getName() + "人员范围导入模板" + time; try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -299,18 +299,16 @@ public class SalarySobController { outputStream.flush(); }; response.setContentType("application/octet-stream"); - return Response.ok(output). - header("Content-disposition", "attachment;filename=" + fileName). - header("Cache-Control", "no-cache").build(); + return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build(); } catch (Exception e) { - log.error("人员范围导入失败",e); + log.error("人员范围导入失败", e); throw e; } } /** - * @description 薪资账套人员范围导入预览 * @return String + * @description 薪资账套人员范围导入预览 * @author Harryxzy * @date 2023/1/9 13:32 */ @@ -323,8 +321,8 @@ public class SalarySobController { } /** - * @description 薪资账套人员范围导入 * @return String + * @description 薪资账套人员范围导入 * @author Harryxzy * @date 2023/1/9 13:32 */ @@ -348,7 +346,7 @@ public class SalarySobController { @Produces(MediaType.APPLICATION_JSON) public String listSalaryItem(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryItemSearchParam queryParam) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult >(user).run(getSalarySobItemWrapper(user)::listPage4SalaryItem, queryParam); + return new ResponseResult>(user).run(getSalarySobItemWrapper(user)::listPage4SalaryItem, queryParam); } @@ -418,30 +416,28 @@ public class SalarySobController { } - /**********************************薪资账套的薪资项目 end*********************************/ - /**********************************薪资账套的回算项目 start*********************************/ - + /** - * @description 薪资账套回算项目列表 * @return String + * @description 薪资账套回算项目列表 * @author Harryxzy * @date 2022/11/16 14:01 */ @GET @Path("/backitem/getAggregate") @Produces(MediaType.APPLICATION_JSON) - public String getSalarySobBackItemAggregate(@Context HttpServletRequest request, @Context HttpServletResponse response,@QueryParam(value = "salarySobId") Long salarySobId) { + public String getSalarySobBackItemAggregate(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "salarySobId") Long salarySobId) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getSalarySobBackItemWrapper(user)::getAggregate, salarySobId); + return new ResponseResult(user).run(getSalarySobBackItemWrapper(user)::getAggregate, salarySobId); } /** - * @description 薪资账套回算项目详情(编辑前获取) * @return null + * @description 薪资账套回算项目详情(编辑前获取) * @author Harryxzy * @date 2022/11/16 14:02 */ @@ -449,29 +445,28 @@ public class SalarySobController { @Path("/backitem/getForm") @ApiOperation("薪资账套回算项目详情") @Produces(MediaType.APPLICATION_JSON) - public String getSalarySobBackItemForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value ="id") Long id) { + public String getSalarySobBackItemForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "id") Long id) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getSalarySobBackItemWrapper(user)::getForm, id); + return new ResponseResult(user).run(getSalarySobBackItemWrapper(user)::getForm, id); } /** - * @description 保存薪资账套回算项目 * @return String + * @description 保存薪资账套回算项目 * @author Harryxzy * @date 2022/11/16 15:05 */ @POST @Path("/backitem/save") @Produces(MediaType.APPLICATION_JSON) - public String saveSalarySobBackItem(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody SalarySobBackItemSaveParam saveParam) { + public String saveSalarySobBackItem(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySobBackItemSaveParam saveParam) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult>(user).run(getSalarySobBackItemWrapper(user)::save, saveParam); + return new ResponseResult>(user).run(getSalarySobBackItemWrapper(user)::save, saveParam); } /**********************************薪资账套的回算项目 end*********************************/ - /**********************************调薪计薪规则 start*********************************/ diff --git a/src/com/engine/salary/web/TaxAgentController.java b/src/com/engine/salary/web/TaxAgentController.java index 7aee3ea8b..6965fcd69 100644 --- a/src/com/engine/salary/web/TaxAgentController.java +++ b/src/com/engine/salary/web/TaxAgentController.java @@ -118,6 +118,14 @@ public class TaxAgentController { return new ResponseResult>>(user).run(getTaxAgentWrapper(user)::list, queryParam); } + @POST + @Path("/listAuth") + @Produces(MediaType.APPLICATION_JSON) + public String selectList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody TaxAgentQueryParam queryParam) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult>(user).run(getTaxAgentWrapper(user)::listAuth, queryParam); + } + //查询个税扣缴义务人下面的代缴机构") @GET @Path("/paymentAgency/list") diff --git a/src/com/engine/salary/wrapper/SalarySobWrapper.java b/src/com/engine/salary/wrapper/SalarySobWrapper.java index d74a9b124..f34eb171a 100644 --- a/src/com/engine/salary/wrapper/SalarySobWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySobWrapper.java @@ -132,8 +132,8 @@ public class SalarySobWrapper extends Service { * * @return */ - public List listAllByAuth() { - return getSalarySobService(user).listAllByAuth(); + public List listAuth(SalarySobQueryParam param) { + return getSalarySobService(user).listAuth(param); } private void handleSalarySobBackItemHistory(SalarySobListQueryParam queryParam) { diff --git a/src/com/engine/salary/wrapper/TaxAgentWrapper.java b/src/com/engine/salary/wrapper/TaxAgentWrapper.java index ce128d83c..6a0618f3b 100644 --- a/src/com/engine/salary/wrapper/TaxAgentWrapper.java +++ b/src/com/engine/salary/wrapper/TaxAgentWrapper.java @@ -5,7 +5,6 @@ import com.cloudstore.dev.api.util.Util_DataCache; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.cache.SalaryCacheKey; -import com.engine.salary.entity.auth.po.AuthRolePO; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.hrm.HrmStatus; import com.engine.salary.entity.taxagent.bo.TaxAgentBO; @@ -21,7 +20,6 @@ import com.engine.salary.service.*; import com.engine.salary.service.auth.AuthRoleService; import com.engine.salary.service.auth.AuthRoleServiceImpl; import com.engine.salary.service.impl.*; -import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -170,6 +168,10 @@ public class TaxAgentWrapper extends Service { } + public List listAuth(TaxAgentQueryParam taxAgentQueryParam) { + return getTaxAgentService(user).listAuth(taxAgentQueryParam); + } + public List> paymentAgencyList(TaxAgentQueryParam queryParam) { // List taxAgentPOS = getTaxAgentService(user).listByIds(queryParam.getIds()); // List paymentAgencyPOS = paymentAgencyService.listAll(currentTenantKey);