Commit 93334d73 authored by hongguangwu's avatar hongguangwu

合同的批量新增、更新、删除,全部成功后,不需要返回data;——倩倩、云霞

parent a83e268d
......@@ -564,7 +564,18 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
returnList.add(errorVo);
}
return R.ok(returnList);
boolean isTrue = true;
for (ErrorVO message : returnList) {
if (CommonConstants.ZERO_INT == message.getResult()) {
isTrue = false;
break;
}
}
if (isTrue) {
return R.ok();
} else {
return R.ok(returnList);
}
}
@Override
......@@ -646,7 +657,18 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
log.error(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR, e);
return R.failed(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR);
}
return R.ok(errorMessageList);
boolean isTrue = true;
for (ErrorMessage message : errorMessageList) {
if (!CommonConstants.SAVE_SUCCESS.equals(message.getMessage())) {
isTrue = false;
break;
}
}
if (isTrue) {
return R.ok();
} else {
return R.ok(errorMessageList);
}
}
/**
......@@ -755,7 +777,18 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
log.error(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR, e);
return R.failed(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR);
}
return R.ok(errorMessageList);
boolean isTrue = true;
for (ErrorMessage message : errorMessageList) {
if (!CommonConstants.SAVE_SUCCESS.equals(message.getMessage())) {
isTrue = false;
break;
}
}
if (isTrue) {
return R.ok();
} else {
return R.ok(errorMessageList);
}
}
/**
......
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