|
|
@@ -1,7 +1,6 @@
|
|
|
package com.uas.platform.b2b.controller;
|
|
|
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
-import java.net.URLDecoder;
|
|
|
import java.util.List;
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -16,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.bind.annotation.ResponseStatus;
|
|
|
|
|
|
+import com.uas.platform.b2b.core.util.SearchKeyUtils;
|
|
|
import com.uas.platform.b2b.model.Enterprise;
|
|
|
import com.uas.platform.b2b.model.QueriableMember;
|
|
|
import com.uas.platform.b2b.model.QueriableUser;
|
|
|
@@ -54,12 +54,12 @@ public class PublicQueryController {
|
|
|
public ModelMap queryEnterprise(String name, String shortName, Long uu) throws UnsupportedEncodingException {
|
|
|
ModelMap returnMap = new ModelMap();
|
|
|
if (!StringUtils.isEmpty(name)) {
|
|
|
- List<Enterprise> enterprises = enterpriseService.findByName(URLDecoder.decode(name, "UTF-8"));
|
|
|
+ List<Enterprise> enterprises = enterpriseService.findByName(SearchKeyUtils.decodeURL(name));
|
|
|
if (!CollectionUtils.isEmpty(enterprises))
|
|
|
returnMap.put("name", QueriableMember.getMembers(enterprises));
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(shortName)) {
|
|
|
- List<Enterprise> enterprises = enterpriseService.findByShortName(URLDecoder.decode(shortName, "UTF-8"));
|
|
|
+ List<Enterprise> enterprises = enterpriseService.findByShortName(SearchKeyUtils.decodeURL(shortName));
|
|
|
if (!CollectionUtils.isEmpty(enterprises))
|
|
|
returnMap.put("shortName", QueriableMember.getMembers(enterprises));
|
|
|
}
|
administrator