Преглед на файлове

fixbug :全局搜索联想词新增store

wangdy преди 7 години
родител
ревизия
e6a96e26d5

+ 4 - 1
src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -665,8 +665,11 @@ public class UserController {
 		userService.saveUserRole(user);
 		if (user != null) {
 			logger.log("用户信息", "修改用户信息,UU:" + user.getUserUU());
-			if (SystemSession.getUser().getUserUU().equals(user.getUserUU()))
+			if (SystemSession.getUser().getUserUU().equals(user.getUserUU())) {
+				user.setEnterprises(SystemSession.getUser().getEnterprises());
+				user.setCurrentEnterprise(SystemSession.getUser().getEnterprise().getUu());
 				request.getSession().setAttribute("user", user);
+			}
 		}
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}

+ 8 - 3
src/main/java/com/uas/platform/b2c/common/search/service/impl/SearcherServiceImpl.java

@@ -659,12 +659,17 @@ public class SearcherServiceImpl implements SearcherService {
             type = "all";
         }
         try {
-            if (type.equals("store")) {
+            if (type.equals("store") || type.equals("all")) {
                 List<VendorIntroduction> vendorIntroductions = vendorIntroductionService.getVendorIntroduction(1,1024*1024*1024,keyword,null).getContent();
                 List<Object> resultMap = FastjsonUtils.fromJsonArray(JSON.toJSONString(vendorIntroductions.stream().map(VendorIntroduction::getEnName).map(en -> {Map s = new HashMap ();s.put("name", en);return s;}).collect(Collectors.toList())
                 ));
-                result= new HashMap<>();
-                result.put("result",resultMap);
+                if (type.equals("store")) {
+                    result= new HashMap<>();
+                    result.put("result",resultMap);
+                } else {
+                    result = searchService.getSimilarKeywords(keyword, type);
+                    result.put("store", resultMap);
+                }
             } else {
                 result = searchService.getSimilarKeywords(keyword, type);
             }