diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridOperatorInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridOperatorInfoController.java index c23ace98d..3679e8020 100755 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridOperatorInfoController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridOperatorInfoController.java @@ -32,6 +32,7 @@ import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO; import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO; import com.elink.esua.epdc.modules.consult.excel.GridOperatorInfoExcel; import com.elink.esua.epdc.modules.consult.service.GridOperatorInfoService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -71,9 +72,11 @@ public class GridOperatorInfoController { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); //校验身份证 - String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo()); - if (idenNoMsg != null) { - return new Result().error(idenNoMsg); + if(StringUtils.isNotBlank(dto.getIdentityNo())){ + String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo()); + if (idenNoMsg != null) { + return new Result().error(idenNoMsg); + } } dto.setShowFlag("0"); gridOperatorInfoService.save(dto); @@ -85,9 +88,11 @@ public class GridOperatorInfoController { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); //校验身份证 - String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo()); - if (idenNoMsg != null) { - return new Result().error(idenNoMsg); + if(StringUtils.isNotBlank(dto.getIdentityNo())){ + String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo()); + if (idenNoMsg != null) { + return new Result().error(idenNoMsg); + } } gridOperatorInfoService.update(dto); return new Result();