紧急处理搜索问题

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

@@ -85,7 +85,7 @@ public class BaseInfoController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -120,7 +120,7 @@ public class BaseInfoController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -154,7 +154,7 @@ public class BaseInfoController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -475,8 +475,8 @@ public class BaseInfoController {
 		pageParams.getFilters().put("searchstatus", Constant.YES);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("status", false, Type.INT, new Long(1)));
-		sortList.add(new Sort("id", true, Type.INT, new Long(1)));
+		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
 	}
@@ -498,8 +498,8 @@ public class BaseInfoController {
 		pageParams.getFilters().put("status", Status.ENABLED.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("status", false, Type.INT, new Long(1)));
-		sortList.add(new Sort("id", true, Type.INT, new Long(1)));
+		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
 	}

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

@@ -77,7 +77,7 @@ public class CartController {
 		// 当前登录企业作为供应商
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_useruu", SystemSession.getUser().getUserUU());

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

@@ -166,7 +166,7 @@ public class DeputyOrderController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -200,7 +200,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_statuscode", Status.UNAUDIT.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -234,7 +234,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_downloadstatus", "未下载");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -268,7 +268,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_downloadstatus", "已下载");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -301,7 +301,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_statuscode", Status.AGREED.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -333,7 +333,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_entrystatus", "保存");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -426,7 +426,7 @@ public class DeputyOrderController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("ve_myenuu", enuu);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchVendorCheckIds(keyword, pageParams);
 	}

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

@@ -96,7 +96,7 @@ public class InvitationRecordController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("in_useruu", SystemSession.getUser().getUserUU());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_date", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         logger.log("邀请注册", "查询邀请记录（个人）");
 		return invitationRecordService.getRecords(pageParams, keyword);
@@ -112,7 +112,7 @@ public class InvitationRecordController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_date", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         logger.log("邀请注册", "查询邀请记录（企业）");
 		return invitationRecordService.getRecords(pageParams, keyword);
@@ -129,7 +129,7 @@ public class InvitationRecordController {
 		pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("in_active", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_date", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         logger.log("邀请注册", "查询邀请记录（企业）--已激活");
 		return invitationRecordService.getRecords(pageParams, keyword);

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

@@ -89,7 +89,7 @@ public class MakeAcceptController {
         pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeAcceptIds(filter.getKeyword(), pageParams);
 	}

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

@@ -94,7 +94,7 @@ public class MakeOrderChangeController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("mcd_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("mcd_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderChangeIds(filter.getKeyword(), pageParams);
 	}

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

@@ -98,7 +98,7 @@ public class MakeOrderController {
         }
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}
@@ -144,7 +144,7 @@ public class MakeOrderController {
 		pageParams.getFilters().put("ma_end", Constant.NO);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}
@@ -190,7 +190,7 @@ public class MakeOrderController {
 		pageParams.getFilters().put("ma_end", Constant.NO);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}
@@ -234,7 +234,7 @@ public class MakeOrderController {
 		pageParams.getFilters().put("ma_end", Constant.YES);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}

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

@@ -83,7 +83,7 @@ public class MakeOutOrderController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(keyword, pageParams);
 	}
@@ -134,7 +134,7 @@ public class MakeOutOrderController {
 		// TODO 供应商分配，已去除
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
 		searchPageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		List<MakeOrder> makeOrders =  searchService.searchMakeOrderIds(keyword, searchPageParams).getContent();
 

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

@@ -85,7 +85,7 @@ public class MakeReturnController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("mr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("mr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeReturnIds(keyword, pageParams);
 	}

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

@@ -64,7 +64,7 @@ public class ProductController {
 			map.put("pr_b2bdisabled", Constant.YES);
 			pageParams.setNotEqualFilters(map);
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+			sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			return searchService.searchProductsCheckIds(keyword, pageParams);
 		} else {
@@ -91,7 +91,7 @@ public class ProductController {
 			map.put("pr_b2bdisabled", Constant.YES);
 			pageParams.setNotEqualFilters(map);
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+			sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			return searchService.searchProductsCheckIds(keyword, pageParams);
 		} else {
@@ -114,7 +114,7 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -148,7 +148,7 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -180,7 +180,7 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -440,8 +440,8 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -462,8 +462,8 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -484,8 +484,8 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}

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

@@ -70,7 +70,7 @@ public class ProductUsersController {
         pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pu_useruu", SystemSession.getUser().getUserUU());
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchProductUsersCheckIds(keyword, pageParams);
     }

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

@@ -206,7 +206,7 @@ public class PubInquiryController {
             pageParams.getFilters().put("id_inid", new MultiValue(list, true));
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -240,7 +240,7 @@ public class PubInquiryController {
         pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
         pageParams.getFilters().put("id_overdue", Constant.NO);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -276,7 +276,7 @@ public class PubInquiryController {
         map.put("id_invalid", Constant.NO);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -312,7 +312,7 @@ public class PubInquiryController {
         map.put("id_invalid", Constant.YES);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -379,7 +379,7 @@ public class PubInquiryController {
         map.put("id_invalid", Constant.YES);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -413,7 +413,7 @@ public class PubInquiryController {
         pageParams.getFilters().put("id_agreed", Constant.NO);
         pageParams.getFilters().put("id_status", Status.REPLIED.value());
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }

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

@@ -176,7 +176,7 @@ public class PubInquiryForPurcController {
         // 当前登录企业作为客户
         pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -199,7 +199,7 @@ public class PubInquiryForPurcController {
         pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
         pageParams.getFilters().put("id_overdue", Constant.NO);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -224,7 +224,7 @@ public class PubInquiryForPurcController {
         map.put("id_invalid", Constant.NO);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -249,7 +249,7 @@ public class PubInquiryForPurcController {
         map.put("id_invalid", Constant.YES);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -296,7 +296,7 @@ public class PubInquiryForPurcController {
         map.put("id_invalid", Constant.YES);
         pageParams.setNotEqualFilters(map);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }
@@ -319,7 +319,7 @@ public class PubInquiryForPurcController {
         pageParams.getFilters().put("id_agreed", Constant.NO);
         pageParams.getFilters().put("id_status", Status.REPLIED.value());
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
     }

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

@@ -211,7 +211,7 @@ public class PurcInquiryController {
 			// 当前登录企业作为供应商
 			pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+			sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 		}
@@ -247,7 +247,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
             pageParams.getFilters().put("id_overdue", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -281,7 +281,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -314,7 +314,7 @@ public class PurcInquiryController {
 			map.put("id_invalid", Constant.YES);
 			pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -352,7 +352,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_agreed", Constant.YES);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -390,7 +390,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_agreed", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -468,7 +468,7 @@ public class PurcInquiryController {
 		pageParams.getFilters().put("in_enterystatus", Status.ENABLED.value());
 		pageParams.getFilters().put("in_isopen", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("in_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		logger.log("采购询价", "查看询价", "查询公共询价信息，关键词： " + keyword);
 		return searchService.searchPurcInquiryCheckIds(keyword, pageParams);
@@ -493,7 +493,7 @@ public class PurcInquiryController {
 		map.put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		logger.log("采购询价", "查看询价", "查询公共询价信息，关键词： " + keyword);
 		return searchService.searchPurcInquiryItemCheckIds(keyword, pageParams);

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

@@ -193,7 +193,7 @@ public class PurcProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -228,7 +228,7 @@ public class PurcProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -261,7 +261,7 @@ public class PurcProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}

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

@@ -89,7 +89,7 @@ public class PurchaseARCheckController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("sac_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("sac_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleARCheckIds(keyword, pageParams);
 	}

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

@@ -217,7 +217,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
@@ -245,7 +245,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -274,7 +274,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -304,7 +304,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("st_ispublish", Constant.YES);
@@ -338,7 +338,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("st_ispublish", Constant.YES);
@@ -368,7 +368,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -393,7 +393,7 @@ public class PurchaseTenderController {
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
@@ -486,7 +486,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchPurcTenderIds(keyword, pageParams);
@@ -536,7 +536,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -568,7 +568,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -594,7 +594,7 @@ public class PurchaseTenderController {
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         // 当前登录企业作为客户
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = userService.distribute();

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

@@ -86,7 +86,7 @@ public class SaleAcceptController {
 			pageParams.getFilters().put("pa_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pa_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pa_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseAcceptIds(keyword, pageParams);
 	}

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

@@ -85,7 +85,7 @@ public class SaleApBillController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pab_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pab_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		SPage<PurchaseApBill> apbills = searchService.searchPurchaseApBillIds(keyword, pageParams);
 		return apbills;

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

@@ -259,7 +259,7 @@ public class SaleApBillOutController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pabo_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
 	}
@@ -293,7 +293,7 @@ public class SaleApBillOutController {
 		List<Sort> sortList = new ArrayList<>();
 		// 如果日期为空，设置的默认时间2000/1/1 1:1:1
 		sortList.add(new Sort("pabo_recorddate", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pabo_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
 	}
@@ -325,7 +325,7 @@ public class SaleApBillOutController {
 		pageParams.getFilters().put("pabo_checkstatus", "已开票");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pabo_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
 	}
@@ -360,7 +360,7 @@ public class SaleApBillOutController {
 		pageParams.getFilters().put("pabo_checkstatus", new MultiValue(list, true));
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pabo_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
 	}

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

@@ -418,7 +418,7 @@ public class SaleApCheckController {
         List<Sort> sortList = new ArrayList<>();
         // 如果日期为空，设置的默认时间2000/1/1 1:1:1
         sortList.add(new Sort("pa_recorddate", false, Type.LONG, new Long(946659661)));
-        sortList.add(new Sort("pa_id", false, Type.INT, new Long(1)));
+        sortList.add(new Sort("pa_id", false, Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return pageParams;
     }

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

@@ -84,7 +84,7 @@ public class SaleBadInController {
 			pageParams.getFilters().put("pb_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pb_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pb_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseBadInIds(keyword, pageParams);
 	}

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

@@ -84,7 +84,7 @@ public class SaleBadOutController {
 			pageParams.getFilters().put("po_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("po_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("po_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseBadOutIds(keyword, pageParams);
 	}

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

@@ -78,7 +78,7 @@ public class SaleCustomerForecastController {
 			pageParams.getFilters().put("pfd_venduu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pfd_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pfd_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseForecastAllIds(keyword, pageParams);
 	}

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

@@ -103,7 +103,7 @@ public class SaleInquiryController {
 			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -137,7 +137,7 @@ public class SaleInquiryController {
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_overdue", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -173,7 +173,7 @@ public class SaleInquiryController {
 		map.put("id_invalid", Constant.NO);
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -208,7 +208,7 @@ public class SaleInquiryController {
 		map.put("id_invalid", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -275,7 +275,7 @@ public class SaleInquiryController {
 		map.put("id_invalid", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -309,7 +309,7 @@ public class SaleInquiryController {
 		pageParams.getFilters().put("id_agreed", Constant.NO);
 		pageParams.getFilters().put("id_status", Status.REPLIED.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -342,7 +342,7 @@ public class SaleInquiryController {
 			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}

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

@@ -88,7 +88,7 @@ public class SaleInquiryMouldController {
 			pageParams.getFilters().put("im_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("im_id", false, Type.INT, 1L));
+		sortList.add(new Sort("im_id", false, Type.LONG, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}
@@ -123,7 +123,7 @@ public class SaleInquiryMouldController {
 		pageParams.getFilters().put("im_overdue", Constant.NO);
 		pageParams.getFilters().put("im_valid", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("im_id", false, Type.INT, 1L));
+		sortList.add(new Sort("im_id", false, Type.LONG, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}
@@ -157,7 +157,7 @@ public class SaleInquiryMouldController {
 		pageParams.getFilters().put("im_status", Status.REPLIED.value());
 		pageParams.getFilters().put("im_valid", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("im_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}
@@ -190,7 +190,7 @@ public class SaleInquiryMouldController {
 		}
 		pageParams.getFilters().put("im_valid", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("im_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}

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

@@ -87,7 +87,7 @@ public class SaleMRBController {
 			pageParams.getFilters().put("pm_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pm_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pm_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseMRBIds(keyword, pageParams);
 	}

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

@@ -98,7 +98,7 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -137,8 +137,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -176,8 +176,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -215,8 +215,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -253,8 +253,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -429,8 +429,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ss_date", false, Type.INT, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ss_date", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}
@@ -467,8 +467,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ss_date", false, Type.INT, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ss_date", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}
@@ -504,8 +504,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ss_date", false, Type.INT, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ss_date", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}

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

@@ -87,7 +87,7 @@ public class SaleOrderChangeController {
 			pageParams.getFilters().put("pc_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}
@@ -121,7 +121,7 @@ public class SaleOrderChangeController {
 		pageParams.getFilters().put("pc_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("pc_unneedreply", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}
@@ -155,7 +155,7 @@ public class SaleOrderChangeController {
 		pageParams.getFilters().put("pc_status", Status.REPLIED.value());
 		pageParams.getFilters().put("pc_unneedreply", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}
@@ -188,7 +188,7 @@ public class SaleOrderChangeController {
 		}
 		pageParams.getFilters().put("pc_unneedreply", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}

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

@@ -194,7 +194,7 @@ public class SaleOrderController {
 		}
 		// TODO 其他过滤条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, 1L));
+		sortList.add(new Sort("pu_id", false, Type.LONG, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("pu_status", (short) Status.UNAUDIT.value());
@@ -228,7 +228,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_status", Status.NOT_REPLY.value());
@@ -261,7 +261,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_reply", Constant.YES);
@@ -299,7 +299,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_status", Status.WAITSELLERCOMFIRM.value());
@@ -334,7 +334,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_end", Constant.YES);
@@ -366,7 +366,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_end", Constant.NO);
@@ -398,7 +398,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		List<Object> list = new ArrayList<>();
@@ -1038,7 +1038,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		Map<String, Object> map = new HashMap<String, Object>();
@@ -1061,7 +1061,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_status", Status.NOT_REPLY);
@@ -1082,7 +1082,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_reply", Constant.YES);
@@ -1103,7 +1103,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_end", Constant.YES);
@@ -1123,7 +1123,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
 		List<Object> list = new ArrayList<>();
 		list.add(Constant.YES);
 		// 建索引时，将不处于已结案状态，但是货物全部交接完毕的单，end值设为了2

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

@@ -87,7 +87,7 @@ public class SaleQuotationController {
 			pageParams.getFilters().put("qu_custuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -126,7 +126,7 @@ public class SaleQuotationController {
 		// 待审批或已提交状态
 		pageParams.getFilters().put("qu_status", new MultiValue(status, true));
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationDoneIds(keyword, pageParams);
 	}
@@ -161,7 +161,7 @@ public class SaleQuotationController {
 		pageParams.setNotEqualFilters(map);
 		pageParams.getFilters().put("qu_agreed", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -196,7 +196,7 @@ public class SaleQuotationController {
 		pageParams.setNotEqualFilters(map);
 		pageParams.getFilters().put("qu_agreed", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -227,7 +227,7 @@ public class SaleQuotationController {
 		}
 		pageParams.getFilters().put("qu_status", Status.INPUTTING.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -261,7 +261,7 @@ public class SaleQuotationController {
         // 已失效
 		pageParams.getFilters().put("qu_overdue", Constant.YES); // 已失效
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}

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

@@ -89,7 +89,7 @@ public class SaleReturnController {
 			pageParams.getFilters().put("pr_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseReturnIds(keyword, pageParams);
 	}

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

@@ -95,7 +95,7 @@ public class SaleSampleController {
 		    return purchaseProofingService.findByPageInfo(pageInfo, null, filter);
         }
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(filter.getKeyword(), pageParams);
 	}
@@ -130,7 +130,7 @@ public class SaleSampleController {
 		}
 		pageParams.getFilters().put("ppi_status", Status.UNSEND.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
@@ -165,7 +165,7 @@ public class SaleSampleController {
 		}
 		pageParams.getFilters().put("ppi_status", Status.SEND.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
@@ -200,7 +200,7 @@ public class SaleSampleController {
 		}
 		pageParams.getFilters().put("ppi_status", Status.CANCELLED.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
@@ -414,8 +414,8 @@ public class SaleSampleController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
 	}
@@ -459,8 +459,8 @@ public class SaleSampleController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
 	}
@@ -501,8 +501,8 @@ public class SaleSampleController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
 	}

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

@@ -57,7 +57,7 @@ public class VendorController {
 		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getEnBussinessCode());
 		pageParams.getFilters().put("ve_vendswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchVendorCheckIds(keyword, pageParams);
 	}
@@ -72,7 +72,7 @@ public class VendorController {
 		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("ve_servicerswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchVendorCheckIds(keyword, pageParams);
 	}
@@ -113,7 +113,7 @@ public class VendorController {
 			}
 			pageParams.getFilters().put("ve_myenuu", new MultiValue(list, true));
 		}
-		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchCustCheckIds(keyword, pageParams);
 	}

src/main/java/com/uas/platform/b2b/erp/controller/UserSpaceDetailController.java

@@ -149,7 +149,7 @@ public class UserSpaceDetailController {
 		ModelMap notMap = new ModelMap();
 		pageParams.setNotEqualFilters(notMap);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Sort.Type.INT, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Sort.Type.LONG, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
 		pageParams.setFilters(map);
 		return searchService.searchVendorForErp(keyword, pageParams);
@@ -173,7 +173,7 @@ public class UserSpaceDetailController {
 		ModelMap notMap = new ModelMap();
 		pageParams.setNotEqualFilters(notMap);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Sort.Type.INT, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Sort.Type.LONG, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
 		pageParams.setFilters(map);
 		return searchService.searchVendorForErp(keyword, pageParams);
@@ -210,7 +210,7 @@ public class UserSpaceDetailController {
 			list.addAll(filter.getDistribute());
 			map.put("ve_myenuu", new MultiValue(list, true));
 		}
-		sortList.add(new Sort("ve_id", false, Sort.Type.INT, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Sort.Type.LONG, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
 		pageParams.setFilters(map);
 		return searchService.searchCustomerForErp(keyword, pageParams);

src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -44,7 +44,7 @@ import java.util.*;
  * 访问拦截
  * 
  * @author hejq
- * @date 2018-07-18 19:08
+ * @date 2018-07-18 19:21
  */
 @SuppressWarnings("deprecation")
 public class SSOInterceptor extends AbstractSSOInterceptor {

src/main/java/com/uas/platform/b2b/mobile/controller/AppInquiryController.java

@@ -84,7 +84,7 @@ public class AppInquiryController {
                 pageParams.getFilters().put("id_inid", new MultiValue(list, true));
             }
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             Page<PurchaseInquiryItem> purchaseInquiryItemPage = searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
             logger.log("客户询价单", "app搜索查看收到的客户询价单列表（全部）");
@@ -139,7 +139,7 @@ public class AppInquiryController {
             pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
             pageParams.getFilters().put("id_overdue", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -191,7 +191,7 @@ public class AppInquiryController {
             map.put("id_invalid", Constant.NO);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -242,7 +242,7 @@ public class AppInquiryController {
             map.put("id_invalid", Constant.YES);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -342,7 +342,7 @@ public class AppInquiryController {
             map.put("id_invalid", Constant.YES);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -393,7 +393,7 @@ public class AppInquiryController {
             pageParams.getFilters().put("id_agreed", Constant.NO);
             pageParams.getFilters().put("id_status", Status.REPLIED.value());
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -443,7 +443,7 @@ public class AppInquiryController {
                 pageParams.getFilters().put("id_inid", new MultiValue(list, true));
             }
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {

src/main/java/com/uas/platform/b2b/mobile/controller/AppPubInquiryController.java

@@ -97,7 +97,7 @@ public class AppPubInquiryController {
                 pageParams.getFilters().put("id_inid", new MultiValue(list, true));
             }
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return toPage(searchService.searchPublicInquiryItemInfoIds(keyword, pageParams));
         } else {
@@ -145,7 +145,7 @@ public class AppPubInquiryController {
             pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
             pageParams.getFilters().put("id_overdue", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return toPage(searchService.searchPublicInquiryItemInfoIds(keyword, pageParams));
         } else {
@@ -198,7 +198,7 @@ public class AppPubInquiryController {
             map.put("id_invalid", Constant.NO);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
         } else {
@@ -250,7 +250,7 @@ public class AppPubInquiryController {
             map.put("id_invalid", Constant.YES);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
         } else {
@@ -351,7 +351,7 @@ public class AppPubInquiryController {
             map.put("id_invalid", Constant.YES);
             pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
         } else {
@@ -402,7 +402,7 @@ public class AppPubInquiryController {
             pageParams.getFilters().put("id_agreed", Constant.NO);
             pageParams.getFilters().put("id_status", Status.REPLIED.value());
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
         } else {

src/main/java/com/uas/platform/b2b/mobile/controller/AppPurcInquiryController.java

@@ -60,7 +60,7 @@ public class AppPurcInquiryController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -81,7 +81,7 @@ public class AppPurcInquiryController {
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_overdue", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -101,7 +101,7 @@ public class AppPurcInquiryController {
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -121,7 +121,7 @@ public class AppPurcInquiryController {
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_status", Status.REPLIED.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -141,7 +141,7 @@ public class AppPurcInquiryController {
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_agreed", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -161,7 +161,7 @@ public class AppPurcInquiryController {
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_agreed", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -185,7 +185,7 @@ public class AppPurcInquiryController {
 		map.put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		logger.log("采购询价", "查看询价", "查询公共询价信息，关键词： " + keyword);
 		return searchService.searchPurcInquiryItemCheckIdsForApp(keyword, pageParams);

src/main/java/com/uas/platform/b2b/mobile/controller/SaleController.java

@@ -217,7 +217,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_status", Status.NOT_REPLY.value());
@@ -268,7 +268,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_reply", Constant.YES);
@@ -323,7 +323,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_status", Status.WAITSELLERCOMFIRM.value());
@@ -377,7 +377,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_end", Constant.YES);
@@ -425,7 +425,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_end", Constant.NO);
@@ -474,7 +474,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 			List<Object> list = new ArrayList<>();
@@ -558,7 +558,7 @@ public class SaleController {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（全部）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 			Map<String, Object> map = new HashMap<String, Object>();
@@ -592,7 +592,7 @@ public class SaleController {
 			logger.log("采购单", "app查看发出的采购订单列表（包括采购明细）（待回复）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_status", Status.NOT_REPLY);
@@ -625,7 +625,7 @@ public class SaleController {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（已回复）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_reply", Constant.YES);
@@ -657,7 +657,7 @@ public class SaleController {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（已结案）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 			pageParams.getFilters().put("pu_end", Constant.YES);
@@ -687,7 +687,7 @@ public class SaleController {
 			logger.log("采购单", "app查看收到的采购订单列表（包括采购明细）（待交货）");
 			com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams(page, size, new HashMap<String, Object>());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
 			List<Object> list = new ArrayList<>();
 			list.add(Constant.YES);
 			list.add((short) 2); // 建索引时，将不处于已结案状态，但是货物全部交接完毕的单，end值设为了2

src/main/java/com/uas/platform/b2b/publicapi/controller/InviteRecordController.java

@@ -5,12 +5,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
+import com.uas.platform.b2b.publicapi.model.Invitation;
+import com.uas.platform.b2b.publicapi.service.InviteRecordService;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.CommBufferedLogger;
-import com.uas.platform.b2b.publicapi.model.Invitation;
-import com.uas.platform.b2b.publicapi.service.InviteRecordService;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
@@ -94,7 +94,7 @@ public class InviteRecordController {
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
         pageParams.getFilters().put("in_useruu", userUU);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("in_date", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("in_date", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return inviteRecordService.getInviteRecords(enUU, userUU, pageParams, keyword);
     }
@@ -119,7 +119,7 @@ public class InviteRecordController {
         pageParams.getFilters().put("in_useruu", userUU);
         pageParams.getFilters().put("in_active", Constant.YES);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("in_date", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("in_date", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return inviteRecordService.getInviteRecords(enUU, userUU, pageParams, keyword);
     }
@@ -144,7 +144,7 @@ public class InviteRecordController {
         pageParams.getFilters().put("in_useruu", userUU);
         pageParams.getFilters().put("in_active", Constant.NO);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("in_date", false, Sort.Type.INT, new Long(1)));
+        sortList.add(new Sort("in_date", false, Sort.Type.LONG, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return inviteRecordService.getInviteRecords(enUU, userUU, pageParams, keyword);
     }

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

@@ -51,7 +51,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchService {
 
 	@Autowired
-	private RestTempSearchService searchService;
+	private com.uas.search.b2b.service.SearchService searchService;
 
 	@Autowired
 	private PurchaseOrderAllDao purchaseOrderAllDao;
@@ -475,6 +475,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, content);
 	}
 
+	@Override
 	public SPage<PurchaseOrderAll> findEnableToChange(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
 		List<PurchaseOrderAll> content = purchaseOrderAllDao.findAll(idsPage.getContent());

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

@@ -721,7 +721,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		SPage<Product> sproducts = searchService.searchProductsCheckIds(keyword, pageParams);
 		List<Product> products = sproducts.getContent();

src/main/resources/dev/dubbo.properties

@@ -0,0 +1,3 @@
+zk.url=zookeeper://10.10.100.11:2181
+dubbo.owner=dev
+dubbo.group=dev

src/main/resources/prod/dubbo.properties

@@ -0,0 +1,3 @@
+zk.url=zookeeper://10.10.100.11:2181
+dubbo.owner=pre
+dubbo.group=pre

src/main/resources/test/dubbo.properties

@@ -0,0 +1,3 @@
+zk.url=zookeeper://10.10.100.11:2181
+dubbo.owner=test
+dubbo.group=test

src/test/java/com/uas/platform/b2b/purc/PurchaseNotify.java

@@ -1,23 +1,34 @@
 package com.uas.platform.b2b.purc;
 
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.BaseJunitTest;
 import com.uas.platform.b2b.dao.PurchaseNoticeDao;
 import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
 import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
+import org.apache.commons.collections.map.HashedMap;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.PersistenceContext;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 public class PurchaseNotify extends BaseJunitTest {
 
@@ -127,4 +138,38 @@ public class PurchaseNotify extends BaseJunitTest {
         return notice;
     }
 
+    @Autowired
+    private RestTemplate restTemplate;
+    @Test
+    public void testHttp() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        MultiValueMap<String, String> map= new LinkedMultiValueMap<>();
+        map.add("code", "XIH1G4");
+        map.add("appSecret", "8a9d398c70f842309472a69bc730038d");
+        map.add("appId", "a9f624cbbdb947049f5638880b0ecbb2");
+        HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(map, headers);
+        ResponseEntity<String> response = restTemplate.postForEntity( "https://opengwtest.bgycc.com/open/oauth/token", request, String.class );
+        System.out.println(response);
+    }
+
+    public static void main(String[] args) throws Exception {
+        Map<String, String> map = new HashedMap();
+        map.put("code", "XIH1G4");
+        map.put("appSecret", "8a9d398c70f842309472a69bc730038d");
+        map.put("appId", "a9f624cbbdb947049f5638880b0ecbb2");
+        String res = doPost("https://opengwtest.bgycc.com/open/oauth/token", JSONObject.toJSONString(map));
+        System.out.println(res);
+    }
+
+    public static String doPost(String postUrl, String formData) throws Exception {
+        HttpClient httpClient = new DefaultHttpClient();
+        HttpPost post = new HttpPost(postUrl);
+        StringEntity postingString = new StringEntity(formData, "UTF-8");
+        post.setEntity(postingString);
+        post.setHeader("Content-type", MediaType.APPLICATION_JSON.toString());
+        HttpResponse response = httpClient.execute(post);
+        String content = EntityUtils.toString(response.getEntity());
+        return content;
+    }
 }