Commit 5244df1b authored by hongguangwu's avatar hongguangwu

MVP1.7.3 优化报错isEmpty 要先判断 list 不为null

parent af915cb0
......@@ -220,7 +220,7 @@ public class DoJointInsuranceTask {
List<EkpInsuranceViewVo> viewVoList;
TInsuranceDetail detail;
viewVoList = ekpSettleService.selectViewBySettleNo(vo.getSettleNo(), vo.getPayFlag());
if (!viewVoList.isEmpty()) {
if (viewVoList != null && !viewVoList.isEmpty()) {
String insuranceId;
for (EkpInsuranceViewVo viewVo : viewVoList) {
//获取所有的明细id
......@@ -273,7 +273,7 @@ public class DoJointInsuranceTask {
} else {
viewVo = ekpSettleService.selectFundViewBySettleNo(vo.getSettleNo(), vo.getPayFlag());
}
if (!viewVo.isEmpty()) {
if (viewVo != null && !viewVo.isEmpty()) {
viewVo.forEach(e -> e.setPayFlag(vo.getPayFlag()));
R<Boolean> flag = socialDaprUtils.updateSocialSettleStatus(viewVo);
if (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData())) {
......@@ -311,7 +311,7 @@ public class DoJointInsuranceTask {
} else {
viewVo = ekpSettleService.selectFIncomelViewBySettleNo(vo.getSettleNo());
}
if (!viewVo.isEmpty()) {
if (viewVo != null && !viewVo.isEmpty()) {
R<Boolean> flag = socialDaprUtils.updateIncomeSettleStatus(viewVo);
if (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData())) {
TUpdateStatusError error = new TUpdateStatusError();
......@@ -357,7 +357,7 @@ public class DoJointInsuranceTask {
error.setTypeFlag(CommonConstants.FIVE_STRING);
//根据结算单号获取明细id和结算状态
viewVo = ekpSettleService.selectSalarylViewBySettleNo(vo.getSettleNo(), vo.getPayFlag());
if (!viewVo.isEmpty()) {
if (viewVo != null && !viewVo.isEmpty()) {
viewVo.forEach(e -> e.setPayFlag(vo.getPayFlag()));
R<Boolean> flag = salaryDaprUtil.updateSalarySettleStatus(viewVo);
if (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData())) {
......@@ -390,7 +390,7 @@ public class DoJointInsuranceTask {
List<EkpInsuranceViewVo> viewVoList;
TInsuranceDetail detail;
viewVoList = ekpSettleService.selectViewBySettleNo(error.getSettleNo(), error.getSettleType());
if (!viewVoList.isEmpty()) {
if (viewVoList != null && !viewVoList.isEmpty()) {
String insuranceId;
for (EkpInsuranceViewVo viewVo : viewVoList) {
//获取所有的明细id
......@@ -437,7 +437,7 @@ public class DoJointInsuranceTask {
} else {
viewVo = ekpSettleService.selectFundViewBySettleNo(error.getSettleNo(), error.getSettleType());
}
if (!viewVo.isEmpty()) {
if (viewVo != null && !viewVo.isEmpty()) {
viewVo.forEach(e -> e.setPayFlag(error.getSettleType()));
R<Boolean> flag = socialDaprUtils.updateSocialSettleStatus(viewVo);
if (!Common.isEmpty(flag) || Boolean.TRUE.equals(flag.getData())) {
......@@ -461,7 +461,7 @@ public class DoJointInsuranceTask {
} else {
viewVo = ekpSettleService.selectFIncomelViewBySettleNo(error.getSettleNo());
}
if (!viewVo.isEmpty()) {
if (viewVo != null && !viewVo.isEmpty()) {
R<Boolean> flag = socialDaprUtils.updateIncomeSettleStatus(viewVo);
if (!Common.isEmpty(flag) || Boolean.TRUE.equals(flag.getData())) {
error.setStatus(CommonConstants.ONE_INT);
......@@ -479,7 +479,7 @@ public class DoJointInsuranceTask {
try {
//根据结算单号获取明细id和结算状态
viewVo = ekpSettleService.selectSalarylViewBySettleNo(error.getSettleNo(), error.getSettleType());
if (!viewVo.isEmpty()) {
if (viewVo != null && !viewVo.isEmpty()) {
viewVo.forEach(e -> e.setPayFlag(error.getSettleType()));
R<Boolean> flag = salaryDaprUtil.updateSalarySettleStatus(viewVo);
if (!Common.isEmpty(flag) && Boolean.TRUE.equals(flag.getData())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment