Commit 5ece38bd28af05fb540fa3c73e55a3c271e523a3

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java View file @ 5ece38b
... ... @@ -11,6 +11,8 @@
11 11 import com.lyms.platform.operate.web.facade.PuerperaManagerFacade;
12 12 import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest;
13 13 import com.lyms.platform.operate.web.result.FrontEndResult;
  14 +import com.lyms.platform.permission.model.Regions;
  15 +import com.lyms.platform.permission.service.RegionsService;
14 16 import com.lyms.platform.pojo.Patients;
15 17 import com.lyms.platform.query.PatientsQuery;
16 18 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -39,6 +41,8 @@
39 41 private CommunityConfigService communityConfigService;
40 42 @Autowired
41 43 private PatientsService patientsService;
  44 + @Autowired
  45 + private RegionsService regionsService;
42 46  
43 47  
44 48  
45 49  
... ... @@ -95,11 +99,12 @@
95 99 @TokenRequired
96 100 public FrontEndResult queryCommunity(CommunityQuery communityQuery) {
97 101 List<CommunityConfig> communityConfigList = communityConfigService.queryCommunity(communityQuery);
98   -
  102 + Regions regions = regionsService.getRegions(Integer.valueOf(communityQuery.getId()));
  103 + if(null == regions) {
  104 + return FrontEndResult.ini(ErrorCodeConstants.PARAMETER_ERROR, "address ID error");
  105 + }
  106 + communityQuery.setLevel(String.valueOf(regions.getLevel()));
99 107 if(null != communityConfigList) {
100   - for(CommunityConfig communityConfig : communityConfigList) {
101   -
102   - }
103 108 return FrontEndResult.ini().setData(communityConfigList).setPageInfo(communityQuery.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
104 109 }
105 110 return FrontEndResult.ini(ErrorCodeConstants.NO_DATA, "没有数据");