diff --git a/src/com/engine/salary/service/impl/SalaryCbsInfoServiceImpl.java b/src/com/engine/salary/service/impl/SalaryCbsInfoServiceImpl.java index d23155bd8..7b451e877 100644 --- a/src/com/engine/salary/service/impl/SalaryCbsInfoServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryCbsInfoServiceImpl.java @@ -315,9 +315,6 @@ public class SalaryCbsInfoServiceImpl extends Service implements com.engine.sala if (!userIdList.contains(Long.valueOf(user.getUID()))) { throw new SalaryRunTimeException("无权限"); } - if (StringUtils.isNotBlank(cbsPushParam.getSalaryCbsId()) && NumberUtils.isCreatable(cbsPushParam.getSalaryCbsId())) { - cbsPushParam.setSalaryCbsIds(Collections.singletonList(Long.valueOf(cbsPushParam.getSalaryCbsId()))); - } if (CollectionUtils.isEmpty(cbsPushParam.getIds()) && CollectionUtils.isEmpty(cbsPushParam.getSalaryCbsIds())) { throw new SalaryRunTimeException("请选择需要推送至CBS的数据"); @@ -438,9 +435,9 @@ public class SalaryCbsInfoServiceImpl extends Service implements com.engine.sala log.error("cbs推送出错1" + pushResult); throw new SalaryRunTimeException("cbs推送出错:" + errorMsg); } - } catch (SalaryRunTimeException e) { + } catch (Exception e) { log.error("cbs推送出错2" + pushResult); - throw new RuntimeException("cbs推送出错:" + e); + throw new SalaryRunTimeException("cbs推送出错:" + e); } } else { // 弹出提示框