yoho-search / yohomars-search-service · Commits

Go to a project

Authored by wangnan
Commit 8f157a1ba72097ce61d6490daf645496cb7a6be8 1 parent 89f221d7

fix bug

Inline Side-by-side
Showing 4 changed files with 3 additions and 26 deletions
... ... @@ -7,13 +7,6 @@
</attributes>
</classpathentry>
<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
... ...
... ... @@ -7,13 +7,6 @@
</attributes>
</classpathentry>
<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
... ...
... ... @@ -8,13 +8,6 @@
</classpathentry>
<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/main/webapp"/>
<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
... ...
... ... @@ -283,16 +283,14 @@ public class SearchServiceHelper {
//List<Map<String, Object>> pageList = new ArrayList<Map<String, Object>>();
for (Map<String, Object> map : resultList) {
if (isSuggest) {
dataMap.put(getSuggestMap(map).get("id").toString(), getSuggestMap(map));
dataMap.put(map.get("id").toString(), getSuggestMap(map));
} else if (paramMap.containsKey("returnField") && StringUtils.isNotBlank(paramMap.get("returnField"))) {
dataMap.put(map.get("id").toString(), getReturnMap(map, paramMap));
} else {
dataMap.put(map.get("id").toString(), map);
}
returnList.add(dataMap);
}
returnList.add(dataMap);
return returnList;
}
... ... @@ -304,7 +302,7 @@ public class SearchServiceHelper {
*/
private Map<String, Object> getSuggestMap(Map<String, Object> map) {
Map<String, Object> dataMap = new HashMap<String, Object>();
dataMap.put("id", map.get("id") == null ? "" : map.get("id"));
//dataMap.put("id", map.get("id") == null ? "" : map.get("id"));
// dataMap.put("city_id", map.get("city_id") == null ? "" : map.get("city_id"));
// dataMap.put("is_top", map.get("is_top") == null ? "" : map.get("is_top"));
// dataMap.put("store_num", map.get("store_num") == null ? "" : map.get("store_num"));
... ...