|
@@ -313,8 +313,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
|
|
|
//region 家庭成员数据
|
|
//region 家庭成员数据
|
|
|
|
|
|
|
|
List<WelcomeFamily> wfs = new ArrayList<>();
|
|
List<WelcomeFamily> wfs = new ArrayList<>();
|
|
|
- if (usr.getFamilys() != null && usr.getFamilys().size() > 0) {
|
|
|
|
|
- for (InsertFamilyRequest family : usr.getFamilys()) {
|
|
|
|
|
|
|
+ if (usr.getFvs() != null && usr.getFvs().size() > 0) {
|
|
|
|
|
+ for (InsertFamilyRequest family : usr.getFvs()) {
|
|
|
if(!(StringUtils.hasText(family.getFamilyShip()) && StringUtils.hasText(family.getName())
|
|
if(!(StringUtils.hasText(family.getFamilyShip()) && StringUtils.hasText(family.getName())
|
|
|
&& StringUtils.hasText(family.getWorkUnit()) && StringUtils.hasText(family.getPhone()))){
|
|
&& StringUtils.hasText(family.getWorkUnit()) && StringUtils.hasText(family.getPhone()))){
|
|
|
return CommonResult.fail("家庭成员信息不能为空!");
|
|
return CommonResult.fail("家庭成员信息不能为空!");
|
|
@@ -332,8 +332,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
|
|
|
|
|
|
|
|
//region 陪同人员数据
|
|
//region 陪同人员数据
|
|
|
List<WelcomeAccompany> was = new ArrayList<>();
|
|
List<WelcomeAccompany> was = new ArrayList<>();
|
|
|
- if (usr.getAccompanys() != null && usr.getAccompanys().size() > 0) {
|
|
|
|
|
- for (InsertAccompanyRequest accompany : usr.getAccompanys()) {
|
|
|
|
|
|
|
+ if (usr.getAvs() != null && usr.getAvs().size() > 0) {
|
|
|
|
|
+ for (InsertAccompanyRequest accompany : usr.getAvs()) {
|
|
|
if(!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))){
|
|
if(!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))){
|
|
|
return CommonResult.fail("陪同人员信息不能为空!");
|
|
return CommonResult.fail("陪同人员信息不能为空!");
|
|
|
}
|
|
}
|