Merge remote-tracking branch 'origin/dev' into feature-hejq-201808

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

@@ -60,9 +60,7 @@ public class ProductController {
 		if (custUU != null && custUU != 0) {
 			pageParams.getFilters().put("pr_enuu", custUU);
 			pageParams.getFilters().put("pr_ispurchase", Constant.YES);
-			HashMap<String, Object> map = new HashMap<>();
-			map.put("pr_b2cenabled", Constant.YES);
-			pageParams.setNotEqualFilters(map);
+			pageParams.getFilters().put("pr_b2cenabled", Constant.YES);
 			List<Sort> sortList = new ArrayList<>();
 			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -87,9 +85,7 @@ public class ProductController {
 		if (vendUU != null && vendUU != 0) {
 			pageParams.getFilters().put("pr_enuu", vendUU);
 			pageParams.getFilters().put("pr_issale", Constant.YES);
-			HashMap<String, Object> map = new HashMap<>();
-			map.put("pr_b2cenabled", Constant.YES);
-			pageParams.setNotEqualFilters(map);
+			pageParams.getFilters().put("pr_b2cenabled", Constant.YES);
 			List<Sort> sortList = new ArrayList<>();
 			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -1306,7 +1306,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	public SPage<InvitationRecord> getInvitationByKeyword(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.INVITATIONRECORDS, pageParams);
 		List<InvitationRecord> content = invitationRecordDao.findAll(idsPage.getContent());
-		sortByProperty(content, InvitationRecord.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}
 

src/main/webapp/resources/js/common/services.js

@@ -131,9 +131,7 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
                     ifModified :true ,
 				};
 				var logout = $http.get(rootPath + "/logout", config);
-				logout.success(uncacheSession);
-				logout.success(function(data){
-				    if (data.url) $http.get(data.url, config);
+				var refresh = function(data) {
                     var pathName = document.location.pathname;
                     var index = pathName.substr(1).indexOf("/");// platform-b2c/logout/proxy
                     var result = pathName.substr(0,index);
@@ -149,6 +147,28 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
                             window.location.href = data.content;
                         }
                     }
+                }
+				logout.success(uncacheSession);
+				logout.success(function(data) {
+                    if (data.url) {
+                        $.ajax({
+                            url: data.url,
+                            type: "get",
+                            cache: false,
+                            dataType: "jsonp",
+                            jsonp: "callback",
+                            jsonpCallback: "successCallback",
+                            success: function (data) {
+                                console.log(data);
+                                refresh(data);
+                            },
+                            error: function (data) {
+                                console.log(data);
+                                refresh(data);
+                            }
+                        });
+                    }
+                    refresh(data);
 				});
 				return logout;
             },

src/main/webapp/resources/js/index/app.js

@@ -1574,12 +1574,13 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     jsonpCallback:"successCallback",
                     success:function(data){
                         console.log(data);
+                        $window.location.reload();
                     },
                     error:function(data){
                         console.log(data);
+                        $window.location.reload();
                     }
                 });
-                $window.location.reload();
             });
         };