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 @@ @@ -7,13 +7,6 @@
7 </attributes> 7 </attributes>
8 </classpathentry> 8 </classpathentry>
9 <classpathentry including="**/*.java" kind="src" path="src/main/resources"/> 9 <classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
10 - <classpathentry including="**/*.java" kind="src" path="src/test/resources"/>  
11 - <classpathentry kind="src" output="target/test-classes" path="src/test/java">  
12 - <attributes>  
13 - <attribute name="optional" value="true"/>  
14 - <attribute name="maven.pomderived" value="true"/>  
15 - </attributes>  
16 - </classpathentry>  
17 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> 10 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
18 <attributes> 11 <attributes>
19 <attribute name="maven.pomderived" value="true"/> 12 <attribute name="maven.pomderived" value="true"/>
@@ -7,13 +7,6 @@ @@ -7,13 +7,6 @@
7 </attributes> 7 </attributes>
8 </classpathentry> 8 </classpathentry>
9 <classpathentry including="**/*.java" kind="src" path="src/main/resources"/> 9 <classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
10 - <classpathentry kind="src" output="target/test-classes" path="src/test/java">  
11 - <attributes>  
12 - <attribute name="optional" value="true"/>  
13 - <attribute name="maven.pomderived" value="true"/>  
14 - </attributes>  
15 - </classpathentry>  
16 - <classpathentry including="**/*.java" kind="src" path="src/test/resources"/>  
17 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> 10 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
18 <attributes> 11 <attributes>
19 <attribute name="maven.pomderived" value="true"/> 12 <attribute name="maven.pomderived" value="true"/>
@@ -8,13 +8,6 @@ @@ -8,13 +8,6 @@
8 </classpathentry> 8 </classpathentry>
9 <classpathentry including="**/*.java" kind="src" path="src/main/resources"/> 9 <classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
10 <classpathentry kind="src" path="src/main/webapp"/> 10 <classpathentry kind="src" path="src/main/webapp"/>
11 - <classpathentry including="**/*.java" kind="src" path="src/test/resources"/>  
12 - <classpathentry kind="src" output="target/test-classes" path="src/test/java">  
13 - <attributes>  
14 - <attribute name="optional" value="true"/>  
15 - <attribute name="maven.pomderived" value="true"/>  
16 - </attributes>  
17 - </classpathentry>  
18 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> 11 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
19 <attributes> 12 <attributes>
20 <attribute name="maven.pomderived" value="true"/> 13 <attribute name="maven.pomderived" value="true"/>
@@ -283,16 +283,14 @@ public class SearchServiceHelper { @@ -283,16 +283,14 @@ public class SearchServiceHelper {
283 //List<Map<String, Object>> pageList = new ArrayList<Map<String, Object>>(); 283 //List<Map<String, Object>> pageList = new ArrayList<Map<String, Object>>();
284 for (Map<String, Object> map : resultList) { 284 for (Map<String, Object> map : resultList) {
285 if (isSuggest) { 285 if (isSuggest) {
286 - dataMap.put(getSuggestMap(map).get("id").toString(), getSuggestMap(map)); 286 + dataMap.put(map.get("id").toString(), getSuggestMap(map));
287 } else if (paramMap.containsKey("returnField") && StringUtils.isNotBlank(paramMap.get("returnField"))) { 287 } else if (paramMap.containsKey("returnField") && StringUtils.isNotBlank(paramMap.get("returnField"))) {
288 dataMap.put(map.get("id").toString(), getReturnMap(map, paramMap)); 288 dataMap.put(map.get("id").toString(), getReturnMap(map, paramMap));
289 } else { 289 } else {
290 dataMap.put(map.get("id").toString(), map); 290 dataMap.put(map.get("id").toString(), map);
291 } 291 }
292 - returnList.add(dataMap);  
293 } 292 }
294 -  
295 - 293 + returnList.add(dataMap);
296 return returnList; 294 return returnList;
297 } 295 }
298 296
@@ -304,7 +302,7 @@ public class SearchServiceHelper { @@ -304,7 +302,7 @@ public class SearchServiceHelper {
304 */ 302 */
305 private Map<String, Object> getSuggestMap(Map<String, Object> map) { 303 private Map<String, Object> getSuggestMap(Map<String, Object> map) {
306 Map<String, Object> dataMap = new HashMap<String, Object>(); 304 Map<String, Object> dataMap = new HashMap<String, Object>();
307 - dataMap.put("id", map.get("id") == null ? "" : map.get("id")); 305 + //dataMap.put("id", map.get("id") == null ? "" : map.get("id"));
308 // dataMap.put("city_id", map.get("city_id") == null ? "" : map.get("city_id")); 306 // dataMap.put("city_id", map.get("city_id") == null ? "" : map.get("city_id"));
309 // dataMap.put("is_top", map.get("is_top") == null ? "" : map.get("is_top")); 307 // dataMap.put("is_top", map.get("is_top") == null ? "" : map.get("is_top"));
310 // dataMap.put("store_num", map.get("store_num") == null ? "" : map.get("store_num")); 308 // dataMap.put("store_num", map.get("store_num") == null ? "" : map.get("store_num"));