处理冲突

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

@@ -119,6 +119,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
         return ServiceUtil.getService(AuthServiceImpl.class, user);
     }
 
+    private PushService getPushService(User user) {
+        return ServiceUtil.getService(PushServiceImpl.class, user);
+    }
+
 
     @Override
     public SalaryAcctRecordPO getById(Long id) {
@@ -539,6 +543,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
         getSalaryStatisticsReportService(user).removeReportCache();
 
 
+        //获取推送配置
+//        getPushService(user).initPushConfig(salaryAcctRecordId);
+
+
         // 记录日志
         String targetName = getLogTargetNameById(salaryAcctRecordId);
         LoggerContext<SalaryAcctRecordPO> loggerContext = new LoggerContext<>();

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

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