jiangjiazhi / regional-platform | GitLab

Commit a51f62610967622c2e5f742d6123d6b153134e7b

Authored by litao@lymsh.com over 7 years ago

1 parent 02963d53b4

Exists in master and in 6 other branches

逗号改括号

Showing 2 changed files with 3 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java

...	...	@@ -19,7 +19,6 @@
19	19
20	20	import javax.servlet.http.HttpServletRequest;
21	21	import javax.validation.Valid;
22		-import java.util.List;
23	22	import java.util.Map;
24	23
25	24
...	...	@@ -52,7 +51,7 @@
52	51	*/
53	52	@RequestMapping(value = "/wx/get/{parentId}",method = RequestMethod.GET)
54	53	@ResponseBody
55		- public List<Map<String, Object>> getTemp(@PathVariable String parentId) {
	54	+ public BaseResponse getTemp(@PathVariable String parentId) {
56	55	return tempFacade.getTemp(parentId);
57	56	}
58	57

...	...	@@ -250,7 +250,7 @@
250	250	return RespBuilder.buildSuccess();
251	251	}
252	252
253		- public List<Map<String,Object>> getTemp(String parentId) {
	253	+ public BaseResponse getTemp(String parentId) {
254	254	List<Map<String, Object>> restList = new ArrayList<>();
255	255	TempModel temp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)), TempModel.class);
256	256	if(temp != null && MapUtils.isNotEmpty(temp.getTempList())) {
...	...	@@ -262,7 +262,7 @@
262	262	restList.add(map);
263	263	}
264	264	}
265		- return restList;
	265	+ return RespBuilder.buildSuccess(restList);
266	266	}
267	267	}