解决冲突

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

@@ -215,9 +215,6 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
     public void calculate(SalaryAcctCalculateParam calculateParam) {
         log.info("开始核算V1{}", calculateParam);
 
-        //报表参数
-        List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).listAllForReport();
-        calculateParam.setEmps(SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId));
 
         // 校验是否可以编辑
         SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(calculateParam.getSalaryAcctRecordId());