Commit a4236d9f7e53c95d4b99edc0d03091c151d282d3
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java
View file @
a4236d9
| ... | ... | @@ -145,13 +145,12 @@ |
| 145 | 145 | |
| 146 | 146 | @RequestMapping(value = "/queryHospitals", method = RequestMethod.GET) |
| 147 | 147 | @ResponseBody |
| 148 | - @TokenRequired | |
| 149 | 148 | public BaseObjectResponse queryHospitals(HttpServletRequest request, |
| 150 | 149 | @RequestParam(required = false) String keyWord, |
| 151 | 150 | @RequestParam(required = false) Integer page, |
| 152 | 151 | @RequestParam(required = false) Integer limit){ |
| 153 | - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 154 | - BaseObjectResponse objectResponse = bookbuildingFacade.queryHospitals(keyWord, page,limit ,loginState.getId()); | |
| 152 | +// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 153 | + BaseObjectResponse objectResponse = bookbuildingFacade.queryHospitals(keyWord, page,limit); | |
| 155 | 154 | return objectResponse; |
| 156 | 155 | } |
| 157 | 156 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
a4236d9
| ... | ... | @@ -858,7 +858,7 @@ |
| 858 | 858 | return objectResponse; |
| 859 | 859 | } |
| 860 | 860 | |
| 861 | - public BaseObjectResponse queryHospitals(String keyWord, Integer page, Integer limit, Integer userId) { | |
| 861 | + public BaseObjectResponse queryHospitals(String keyWord, Integer page, Integer limit) { | |
| 862 | 862 | OrganizationQuery organizationQuery = new OrganizationQuery(); |
| 863 | 863 | if(null != page && limit != page) { |
| 864 | 864 | organizationQuery.setNeed("true"); |
| 865 | 865 | |
| 866 | 866 | |
| 867 | 867 | |
| ... | ... | @@ -870,19 +870,22 @@ |
| 870 | 870 | organizationQuery.setYn(YnEnums.YES.getId()); |
| 871 | 871 | organizationQuery.setKeyword(keyWord); |
| 872 | 872 | |
| 873 | - Map<String,String> map = new HashMap<>(); | |
| 873 | + | |
| 874 | + List<Map<String,String>> mapList = new ArrayList<>(); | |
| 874 | 875 | List<Organization> orgs = organizationService.queryHospitals(organizationQuery); |
| 875 | 876 | if (CollectionUtils.isNotEmpty(orgs)) |
| 876 | 877 | { |
| 877 | 878 | for(Organization org : orgs) |
| 878 | 879 | { |
| 880 | + Map<String,String> map = new HashMap<>(); | |
| 879 | 881 | map.put("id",org.getId()+""); |
| 880 | - map.put("name",org.getName()); | |
| 882 | + map.put("name", org.getName()); | |
| 883 | + mapList.add(map); | |
| 881 | 884 | } |
| 882 | 885 | } |
| 883 | 886 | |
| 884 | 887 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
| 885 | - objectResponse.setData(map); | |
| 888 | + objectResponse.setData(mapList); | |
| 886 | 889 | |
| 887 | 890 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 888 | 891 | objectResponse.setErrormsg("成功"); |