diff --git a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java index 39b2f95..c86ba9f 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/service/ViolationServiceImpl.java @@ -5,6 +5,7 @@ import com.bonus.gs.sub.evaluate.manager.utils.RegularCheckUtils; import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ImportUserDataVo; import com.bonus.gs.sub.evaluate.outsourceEnterprise.beans.ViolationBean; import com.bonus.gs.sub.evaluate.outsourceEnterprise.dao.ViolationDao; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; @@ -28,13 +29,20 @@ public class ViolationServiceImpl implements ViolationService { @Override public AjaxRes addOutsourceEnterprise(ViolationBean o) { AjaxRes ar = new AjaxRes(); - if (!isValidChineseMobileNumber(o.getPhone()) || !isValidChineseMobileNumber(o.getPreSalesPhone())) { - ar.setFailMsg("手机号码格式不正确!"); - return ar; + if (StringUtils.isNotBlank(o.getPhone())) { + if (!isValidChineseMobileNumber(o.getPhone())) { + ar.setFailMsg("法人手机号码格式不正确!"); + return ar; + } + } + if ( StringUtils.isNotBlank(o.getPreSalesPhone())) { + if (!isValidChineseMobileNumber(o.getPreSalesPhone())) { + ar.setFailMsg("售前委托人手机号码不正确!"); + return ar; + } } ViolationBean selected = new ViolationBean(); - selected.setIdCard(o.getIdCard()); int isAc = dao.getOutSourceNumById(selected); /*if(isAc>0){ @@ -50,19 +58,24 @@ public class ViolationServiceImpl implements ViolationService { return ar; } - selected = new ViolationBean(); - selected.setSocialCreditCode(o.getSocialCreditCode()); - isAc = dao.getOutSourceNumById(selected); - if (isAc > 0) { - ar.setFailMsg("统一社会信用代码已存在!"); - return ar; + if (StringUtils.isNotBlank(o.getSocialCreditCode())) { + selected = new ViolationBean(); + selected.setSocialCreditCode(o.getSocialCreditCode()); + isAc = dao.getOutSourceNumById(selected); + if (isAc > 0) { + ar.setFailMsg("统一社会信用代码已存在!"); + return ar; + } } - selected = new ViolationBean(); - selected.setPhone(o.getPhone()); - isAc = dao.getOutSourceNumById(selected); - if (isAc > 0) { - ar.setFailMsg("手机号码已存在!"); - return ar; + + if (StringUtils.isNotBlank(o.getPhone())) { + selected = new ViolationBean(); + selected.setPhone(o.getPhone()); + isAc = dao.getOutSourceNumById(selected); + if (isAc > 0) { + ar.setFailMsg("手机号码已存在!"); + return ar; + } } int num = dao.addOutsourceEnterprise(o); @@ -96,9 +109,17 @@ public class ViolationServiceImpl implements ViolationService { @Override public AjaxRes updateOutsourceEnterprise(ViolationBean o) { AjaxRes ar = new AjaxRes(); - if (!isValidChineseMobileNumber(o.getPhone()) || !isValidChineseMobileNumber(o.getPreSalesPhone())) { - ar.setFailMsg("手机号码格式不正确!"); - return ar; + if (StringUtils.isNotBlank(o.getPhone())) { + if (!isValidChineseMobileNumber(o.getPhone())) { + ar.setFailMsg("法人手机号码格式不正确!"); + return ar; + } + } + if ( StringUtils.isNotBlank(o.getPreSalesPhone())) { + if (!isValidChineseMobileNumber(o.getPreSalesPhone())) { + ar.setFailMsg("售前委托人手机号码不正确!"); + return ar; + } } ViolationBean selected = new ViolationBean(); @@ -119,21 +140,25 @@ public class ViolationServiceImpl implements ViolationService { return ar; } - selected = new ViolationBean(); - selected.setId(o.getId()); - selected.setSocialCreditCode(o.getSocialCreditCode()); - isAc = dao.getOutSourceNumById(selected); - if (isAc > 0) { - ar.setFailMsg("统一社会信用代码已存在!"); - return ar; + if (StringUtils.isNotBlank(o.getSocialCreditCode())) { + selected = new ViolationBean(); + selected.setId(o.getId()); + selected.setSocialCreditCode(o.getSocialCreditCode()); + isAc = dao.getOutSourceNumById(selected); + if (isAc > 0) { + ar.setFailMsg("统一社会信用代码已存在!"); + return ar; + } } - selected = new ViolationBean(); - selected.setId(o.getId()); - selected.setPhone(o.getPhone()); - isAc = dao.getOutSourceNumById(selected); - if (isAc > 0) { - ar.setFailMsg("手机号码已存在!"); - return ar; + if (StringUtils.isNotBlank(o.getPhone())) { + selected = new ViolationBean(); + selected.setId(o.getId()); + selected.setPhone(o.getPhone()); + isAc = dao.getOutSourceNumById(selected); + if (isAc > 0) { + ar.setFailMsg("手机号码已存在!"); + return ar; + } } int num = dao.updateOutsourceEnterprise(o); @@ -173,9 +198,6 @@ public class ViolationServiceImpl implements ViolationService { /** * 导入数据校验 * - * @param socialCreditCode - * @param idCard - * @param phone * @return */ @Override diff --git a/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseFrom.html b/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseFrom.html index bcfec77..0c958e8 100644 --- a/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseFrom.html +++ b/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseFrom.html @@ -45,21 +45,21 @@