diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/CommunityQuery.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/CommunityQuery.java index 307251e..1466d19 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/CommunityQuery.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/CommunityQuery.java @@ -7,7 +7,7 @@ import com.lyms.platform.common.dao.BaseQuery; */ public class CommunityQuery extends BaseQuery { private String keyword; - private String id; + private Integer id; private String level; public String getLevel() { @@ -18,11 +18,11 @@ public class CommunityQuery extends BaseQuery { this.level = level; } - public String getId() { + public Integer getId() { return id; } - public void setId(String id) { + public void setId(Integer id) { this.id = id; } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java index 9dd02d3..e721201 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java @@ -47,11 +47,11 @@ public class CommunityConfigService { } mongoCondition.and("yn", YnEnums.YES.getId(), MongoOper.IS); if(null != communityQuery.getLevel() && communityQuery.getLevel().equals("3")) { - mongoCondition = mongoCondition.andCondition(new MongoCondition("areaId", Integer.parseInt(communityQuery.getId()), MongoOper.IS)); + mongoCondition = mongoCondition.andCondition(new MongoCondition("areaId", communityQuery.getId(), MongoOper.IS)); } else if(null != communityQuery.getLevel() && communityQuery.getLevel().equals("2")) { - mongoCondition = mongoCondition.andCondition(new MongoCondition("cityId", Integer.parseInt(communityQuery.getId()), MongoOper.IS)); + mongoCondition = mongoCondition.andCondition(new MongoCondition("cityId", communityQuery.getId(), MongoOper.IS)); } else if(null != communityQuery.getLevel() && communityQuery.getLevel().equals("1")) { - mongoCondition = mongoCondition.andCondition(new MongoCondition("provinceId", Integer.parseInt(communityQuery.getId()), MongoOper.IS)); + mongoCondition = mongoCondition.andCondition(new MongoCondition("provinceId", communityQuery.getId(), MongoOper.IS)); } MongoQuery mongoQuery = mongoCondition.toMongoQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java index 88bad03..da117db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java @@ -99,11 +99,18 @@ public class CommunityConfigController extends RestController { @TokenRequired public FrontEndResult queryCommunity(CommunityQuery communityQuery) { List communityConfigList = communityConfigService.queryCommunity(communityQuery); - Regions regions = regionsService.getRegions(Integer.valueOf(communityQuery.getId())); - if(null == regions) { - return FrontEndResult.ini(ErrorCodeConstants.PARAMETER_ERROR, "address ID error"); + Regions regions = null; + if(null != communityQuery.getId()) { + regions = regionsService.getRegions(Integer.valueOf(communityQuery.getId())); + + if(null == regions) { + return FrontEndResult.ini(ErrorCodeConstants.PARAMETER_ERROR, "address ID error"); + } + + communityQuery.setLevel(String.valueOf(regions.getLevel())); } - communityQuery.setLevel(String.valueOf(regions.getLevel())); + + if(null != communityConfigList) { return FrontEndResult.ini().setData(communityConfigList).setPageInfo(communityQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); }