Merge branch 'feature/权限' into feature/数据推送

# Conflicts:
#	src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java

src/com/engine/salary/mapper/setting/PageListTemplateMapper.xml

@@ -6,7 +6,7 @@
         <result column="creator" property="creator"/>
         <result column="delete_type" property="deleteType"/>
         <result column="id" property="id"/>
-        <result column="limit_ids" property="limitIds" typeHandler="com.engine.salary.handle.SalaryListTypeHandler"/>
+        <result column="limit_ids" property="limitIds" typeHandler="com.engine.salary.handle.LongListTypeHandler"/>
         <result column="name" property="name"/>
         <result column="page" property="page"/>
         <result column="setting" property="setting" typeHandler="com.engine.salary.handle.SalaryListTypeHandler" />

src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java

@@ -302,7 +302,7 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
             // 根据关键词过滤
             if (StringUtils.isNotBlank(queryParam.getKeyword())) {
                 employeeList = employeeList.stream()
-                        .filter(e -> (e.getUsername().contains(queryParam.getKeyword()) || (StringUtils.isNotEmpty(e.getWorkcode()) && e.getWorkcode().contains(queryParam.getKeyword()))))
+                        .filter(e -> (StringUtils.isNotEmpty(e.getUsername()) && e.getUsername().contains(queryParam.getKeyword()) || (StringUtils.isNotEmpty(e.getWorkcode()) && e.getWorkcode().contains(queryParam.getKeyword()))))
                         .collect(Collectors.toList());
             }
             List<Long> employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList());

src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java

@@ -602,6 +602,8 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
 
         // 转换成薪资核算人员po
         List<SalaryAcctEmployeePO> newEmps = SalaryAcctEmployeeBO.convert2Employee(salaryEmployees, salaryAcctRecordPO, salaryArchiveDataDTOS, (long) user.getUID());
+        //过滤掉不属于当前账套扣缴义务人的人员
+        newEmps = newEmps.stream().filter(po -> taxAgentIds.contains(po.getTaxAgentId())).collect(Collectors.toList());
         Map<String, SalaryAcctEmployeePO> newEmpMap = SalaryEntityUtil.convert2Map(newEmps, e -> e.getTaxAgentId() + "_" + e.getEmployeeId());
 
 

src/com/engine/salary/service/impl/SettingServiceImpl.java

@@ -245,15 +245,11 @@ public class SettingServiceImpl extends Service implements SettingService {
         PageLinkPO link = getPageLinkMapper().getLink((long) user.getUID(), SALARY_DETAILS_REPORT.getValue());
 
         Collection<TaxAgentPO> taxAgentPOS = getTaxAgentService().listAllTaxAgents((long) user.getUID());
-        List<String> taxIds = SalaryEntityUtil.properties(taxAgentPOS, po -> po.getId().toString(), Collectors.toList());
+        List<Long> taxIds = SalaryEntityUtil.properties(taxAgentPOS, TaxAgentPO::getId, Collectors.toList());
         pos = pos.stream().filter(po -> {
             if (po.getSharedType() == 1) {
-                List limitIds = po.getLimitIds();
-                List<String> collect = new ArrayList<>();
-                for (int i = 0; i < limitIds.size(); i++) {
-                    collect.add(limitIds.get(i).toString());
-                }
-                return CollectionUtil.isNotEmpty(limitIds) && CollectionUtil.intersection(collect, taxIds).size() != 0;
+                List<Long> limitIds = po.getLimitIds();
+                return CollectionUtil.isNotEmpty(limitIds) && CollectionUtil.intersection(limitIds, taxIds).size() != 0;
             }
             return true;
         }).peek(po -> {

src/com/engine/salary/util/SalaryTokenUtil.java

@@ -95,6 +95,9 @@ public class SalaryTokenUtil {
 
         // 获取appid的id
         String appidId = baseBean.getPropValue("hrmSalaryBillToken", "appid_id");
+        if (StringUtils.isBlank(appidId)) {
+            return resultMap;
+        }
         String ip = baseBean.getPropValue("hrmSalaryBillToken", "ip");
         rs.execute("select APPID from ECOLOGY_BIZ_EC where id =" + appidId);
         // 获取appid

src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java

@@ -146,6 +146,7 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord
             List<SalarySendCheckDTO> salarySendCheckResult = getSalarySendService(user).getSalarySendCheckResult(salaryAcctRecordIds);
 
             List<TaxAgentPO> taxAgentPOS = getTaxAgentService(user).listAll();
+
             // 转换成列表dto
             List<SalaryAcctRecordListDTO> salaryAcctRecordListDTOS = SalaryAcctRecordBO.convert2ListDTO(list, salarySobPOS, employeeComInfos, salaryAcctEmployeeCountDTOS, salarySendCheckResult, taxAgentPOS, needApprovalSalarySobIds, approvalCanFile, approvalCanReCalc);
             dtoPage.setList(salaryAcctRecordListDTOS);

src/com/engine/salary/wrapper/SalarySobItemWrapper.java

@@ -75,9 +75,6 @@ public class SalarySobItemWrapper extends Service {
         Integer searchPageSize = queryParam.getPageSize();
         Integer searchCurrent = queryParam.getCurrent();
 
-        // 分页查询薪资项目
-        queryParam.setPageSize(10000000);
-        queryParam.setCurrent(1);
         PageInfo<SalaryItemPO> page = getSalaryItemService(user).listPageByParam(queryParam);
 
         List<SalaryItemPO> salaryItemList = page.getList();