git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1125 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/PublicQueryController.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import java.io.UnsupportedEncodingException;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -59,7 +60,7 @@ public class PublicQueryController {
 				returnMap.put("name", QueriableMember.getMembers(enterprises));
 		}
 		if (!StringUtils.isEmpty(shortName)) {
-			List<Enterprise> enterprises = enterpriseService.findByShortName(SearchKeyUtils.decodeURL(shortName));
+			Set<Enterprise> enterprises = enterpriseService.findByShortName(SearchKeyUtils.decodeURL(shortName));
 			if (!CollectionUtils.isEmpty(enterprises))
 				returnMap.put("shortName", QueriableMember.getMembers(enterprises));
 		}

src/main/java/com/uas/platform/b2b/model/QueriableMember.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.model;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import org.springframework.util.CollectionUtils;
@@ -61,7 +62,7 @@ public class QueriableMember {
 		this.address = enterprise.getEnAddress();
 	}
 
-	public static List<QueriableMember> getMembers(List<Enterprise> enterprises) {
+	public static List<QueriableMember> getMembers(Collection<Enterprise> enterprises) {
 		if (!CollectionUtils.isEmpty(enterprises)) {
 			List<QueriableMember> members = new ArrayList<QueriableMember>();
 			for (Enterprise enterprise : enterprises)

src/main/java/com/uas/platform/b2b/service/EnterpriseService.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.service;
 
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -46,7 +47,7 @@ public interface EnterpriseService {
 	 * @param shortName
 	 * @return
 	 */
-	public List<Enterprise> findByShortName(String shortName);
+	public Set<Enterprise> findByShortName(String shortName);
 
 	public List<Enterprise> getUnauditedEnterprises();
 

src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -14,6 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import com.uas.platform.b2b.core.util.SearchKeyUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.RegisterRecordDao;
 import com.uas.platform.b2b.dao.UserDao;
@@ -67,9 +69,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 			enterprise.setEnSendStatus((short) Status.NOT_UPLOAD.value());// 上传状态设为未上传
 			Enterprise newEnterprise = enterpriseDao.save(enterprise);// 保存enterprise
 			User user = new User();
-			user.setUserName(enterprise.getEnAdminName());//管理员姓名
-			if(StringUtils.isEmpty(enterprise.getEnAdminName())) {
-				user.setUserName("管理员");//默认“管理员”
+			user.setUserName(enterprise.getEnAdminName());// 管理员姓名
+			if (StringUtils.isEmpty(enterprise.getEnAdminName())) {
+				user.setUserName("管理员");// 默认“管理员”
 			}
 			user.setUserEmail(enterprise.getEnAdminEmail());
 			user.setUserTel(enterprise.getEnAdminTel());
@@ -303,8 +305,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	}
 
 	@Override
-	public List<Enterprise> findByShortName(String shortName) {
-		return enterpriseDao.findByEnShortName(shortName);
+	public Set<Enterprise> findByShortName(String shortName) {
+		Set<Enterprise> enterprises = new HashSet<Enterprise>();
+		Set<String> keys = SearchKeyUtils.splitToKeys(shortName, true);
+		for (String key : keys)
+			enterprises.addAll(enterpriseDao.findByEnShortName(key));
+		return enterprises;
 	}
 
 }