diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 291761f..652fea0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -24,6 +24,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.math.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; @@ -991,10 +992,14 @@ public class BabyBookbuildingFacade { if (StringUtils.isNotEmpty(model.getDeliverOrg())) { - Organization org = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); - if (org != null) - { - result.setDeliverOrg(org.getName()); + if(org.apache.commons.lang.math.NumberUtils.isNumber(model.getDeliverOrg())){ + Organization org = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); + if (org != null) + { + result.setDeliverOrg(org.getName()); + } + }else { + result.setDeliverOrg(model.getDeliverOrg()); } }