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

处理冲突

This commit is contained in:
钱涛 2024-12-10 14:24:42 +08:00
parent 36de3feeed
commit 72605793d1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/engine/salary/service/impl/SettingServiceImpl.java
View File

@ -14,8 +14,10 @@ import com.engine.salary.entity.setting.param.*;
import com.engine.salary.entity.setting.po.PageLinkPO;
import com.engine.salary.entity.setting.po.PageListSettingPO;
import com.engine.salary.entity.setting.po.PageListTemplatePO;
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.common.SharedTypeEnum;
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.mapper.setting.PageLinkMapper;
@ -288,7 +290,9 @@ public class SettingServiceImpl extends Service implements SettingService {
Long templateId = link.getTemplateId();
//权限控制
Collection<TaxAgentPO> taxAgentPOS = getTaxAgentService().listAllTaxAgents((long) user.getUID());
TaxAgentQueryParam taxAgentQueryParam = TaxAgentQueryParam.builder().build();
taxAgentQueryParam.setFilterType(AuthFilterTypeEnum.QUERY_DATA);
Collection<TaxAgentPO> taxAgentPOS = getTaxAgentService().listAuth(taxAgentQueryParam);
List<Long> taxIds = SalaryEntityUtil.properties(taxAgentPOS, TaxAgentPO::getId, Collectors.toList());
Boolean chief = getTaxAgentService().isChief((long) user.getUID());
pos = pos.stream().filter(po -> {
@ -380,7 +384,10 @@ public class SettingServiceImpl extends Service implements SettingService {
//权限控制
List<TaxAgentPO> agentPOList = getTaxAgentService().listAll();
Map<Long, String> idNameMap = SalaryEntityUtil.convert2Map(agentPOList, TaxAgentPO::getId, TaxAgentPO::getName);
Collection<TaxAgentPO> taxAgentPOS = getTaxAgentService().listAllTaxAgents((long) user.getUID());
//权限控制
TaxAgentQueryParam taxAgentQueryParam = TaxAgentQueryParam.builder().build();
taxAgentQueryParam.setFilterType(AuthFilterTypeEnum.QUERY_DATA);
Collection<TaxAgentPO> taxAgentPOS = getTaxAgentService().listAuth(taxAgentQueryParam);
Boolean chief = getTaxAgentService().isChief((long) user.getUID());
List<Long> taxIds = SalaryEntityUtil.properties(taxAgentPOS, TaxAgentPO::getId, Collectors.toList());
List<PageListTemplateDTO> templateDTOS = pos.stream()