更新搜索方法为HTTP方式，去掉dubbo服务

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.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -482,8 +482,8 @@ public class BaseInfoController {
 		pageParams.getFilters().put("searchstatus", Constant.YES);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("status", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id", true, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
 	}
@@ -505,8 +505,8 @@ public class BaseInfoController {
 		pageParams.getFilters().put("status", Status.ENABLED.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("status", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id", true, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("mcd_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("mr_id", false, Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pr_id", false, Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pr_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -446,8 +446,8 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_matchsize", true, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -468,8 +468,8 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_matchsize", true, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -490,8 +490,8 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("pr_matchsize", true, Type.INT, 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.LONG, new Long(1)));
+        sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchProductUsersCheckIds(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.LONG, new Long(1)));
+			sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("in_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, 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/PurcOrderChangeController.java

@@ -23,7 +23,6 @@ import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -77,7 +76,7 @@ public class PurcOrderChangeController {
             map.put("pu_status", Status.UNAUDIT.value());
             params.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
             params.getFilters().put(SearchConstants.SORT_KEY, sortList);
             sPage = searchService.findEnableToChange(filter.getKeyword(), params);
         } else {
@@ -114,7 +113,7 @@ public class PurcOrderChangeController {
         if (!StringUtils.isEmpty(filter.getKeyword())) {
             pageParams.getFilters().put("pc_enuu", SystemSession.getUser().getEnterprise().getUu());
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("pc_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
         } else {
@@ -141,7 +140,7 @@ public class PurcOrderChangeController {
             pageParams.getFilters().put("pc_status", Status.NOT_REPLY.value());
             pageParams.getFilters().put("pc_unneedreply", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("pc_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
         } else {
@@ -170,7 +169,7 @@ public class PurcOrderChangeController {
             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, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("pc_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
         } else {
@@ -198,7 +197,7 @@ public class PurcOrderChangeController {
             pageParams.getFilters().put("pc_enuu", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("pc_unneedreply", Constant.YES);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("pc_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
         } else {

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.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("sac_id", false, Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pa_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pab_id", false, Type.INT, 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/SaleApCheckController.java

@@ -383,8 +383,8 @@ 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.LONG, new Long(1)));
+        sortList.add(new Sort("pa_recorddate", false, Type.INT, new Long(946659661)));
+        sortList.add(new Sort("pa_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pb_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("po_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pfd_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -237,7 +237,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.LONG, 1L));
+		sortList.add(new Sort("id_id", false, Type.INT, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
 		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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, 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.LONG, 1L));
+		sortList.add(new Sort("im_id", false, Type.INT, 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.LONG, 1L));
+		sortList.add(new Sort("im_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("im_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("im_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pm_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pn_id", false, Type.INT, 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.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.INT, 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.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.INT, 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.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.INT, 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.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.INT, 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.LONG, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ss_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("ss_id", false, Type.INT, 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.LONG, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ss_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("ss_id", false, Type.INT, 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.LONG, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ss_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("ss_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, 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.LONG, 1L));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		List<Object> list = new ArrayList<>();
@@ -1027,7 +1027,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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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>();
@@ -1050,7 +1050,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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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);
@@ -1071,7 +1071,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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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);
@@ -1092,7 +1092,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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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);
@@ -1112,7 +1112,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.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, 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.LONG, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("psa_id", false, Type.INT, 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.LONG, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("psa_id", false, Type.INT, 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.LONG, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
 	}

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

@@ -129,7 +129,7 @@ public class SaleTenderQuestionController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_venduu", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchSaleTenderQuestion(filter.getKeyword(), pageParams);
@@ -161,7 +161,7 @@ public class SaleTenderQuestionController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("stq_status", Status.REPLIED.value());
@@ -194,7 +194,7 @@ public class SaleTenderQuestionController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("stq_status", Status.NOT_REPLY.value());
@@ -226,7 +226,7 @@ public class SaleTenderQuestionController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_ptaid", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchSaleTenderQuestion(filter.getKeyword(), pageParams);
@@ -258,7 +258,7 @@ public class SaleTenderQuestionController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_ptaid", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchSaleTenderQuestion(filter.getKeyword(), pageParams);
@@ -290,7 +290,7 @@ public class SaleTenderQuestionController {
         }
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_ptaid", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchSaleTenderQuestion(filter.getKeyword(), 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.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, 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.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchCustCheckIds(keyword, pageParams);
 	}

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

@@ -156,7 +156,7 @@ public class TenderController {
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
         pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getUu());
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("ve_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("ve_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchVendorIds(keyword, pageParams);
     }
@@ -246,7 +246,7 @@ public class TenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("st_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("st_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_ispublish", Constant.NO); // 已发布
@@ -273,7 +273,7 @@ public class TenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("st_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("st_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_ispublish", Constant.NO); // 已发布
@@ -301,7 +301,7 @@ public class TenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("st_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("st_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_ispublish", Constant.NO); // 已发布
@@ -330,7 +330,7 @@ public class TenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("st_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("st_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_ispublish", Constant.NO); // 已发布
@@ -359,7 +359,7 @@ public class TenderController {
 //            return null;
 //        }
 //        List<Sort> sortList = new ArrayList<>();
-//        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+//        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
 //        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 //        pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getEnName());
 //        pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -383,7 +383,7 @@ public class TenderController {
         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.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
@@ -414,7 +414,7 @@ public class TenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         return searchService.erpSearchPurcTenderIds(keyword, pageParams);
@@ -453,7 +453,7 @@ public class TenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -482,7 +482,7 @@ public class TenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -512,7 +512,7 @@ public class TenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -541,7 +541,7 @@ public class TenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -565,7 +565,7 @@ public class TenderController {
         // 当前登录企业作为客户
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = userService.distribute();
@@ -865,7 +865,7 @@ public class TenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_ptaid", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchSaleTenderQuestion(keyword, pageParams);
@@ -889,7 +889,7 @@ public class TenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_ptaid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("stq_status", Status.REPLIED.value());
@@ -914,7 +914,7 @@ public class TenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_ptaid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("stq_status", Status.NOT_REPLY.value());

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

@@ -150,7 +150,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.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Sort.Type.INT, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
 		pageParams.setFilters(map);
 		return searchService.searchVendorForErp(keyword, pageParams);
@@ -174,7 +174,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.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Sort.Type.INT, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
 		pageParams.setFilters(map);
 		return searchService.searchVendorForErp(keyword, pageParams);
@@ -208,7 +208,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.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Sort.Type.INT, new Long(1)));
 		map.put(SearchConstants.SORT_KEY, sortList);
 		pageParams.setFilters(map);
 		return searchService.searchCustomerForErp(keyword, pageParams);

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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
         } else {
@@ -290,7 +290,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.LONG, 1L));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, 1L));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
             return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
@@ -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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Sort.Type.INT, 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/AppPurcInquiryController.java

@@ -59,7 +59,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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -80,7 +80,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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -100,7 +100,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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -120,7 +120,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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -140,7 +140,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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -160,7 +160,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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIdsForApp(keyword, pageParams);
 	}
@@ -184,7 +184,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.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, 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

@@ -160,7 +160,7 @@ public class SaleController {
 			}
 			// TODO 其他过滤条件
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, 1L));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 1L));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			Map<String, Object> map = new HashMap<String, Object>();
 			map.put("pu_status", (short) Status.UNAUDIT.value());
@@ -217,7 +217,7 @@ public class SaleController {
 			}
 			// 当前登录企业作为供应商
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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.LONG, new Long(1)));
+			sortList.add(new Sort("pu_id", false, Sort.Type.INT, 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

@@ -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.LONG, new Long(1)));
+        sortList.add(new Sort("in_date", false, Sort.Type.INT, 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.LONG, new Long(1)));
+        sortList.add(new Sort("in_date", false, Sort.Type.INT, 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.LONG, new Long(1)));
+        sortList.add(new Sort("in_date", false, Sort.Type.INT, 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

@@ -52,7 +52,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchService {
 
 	@Autowired
-	private com.uas.search.b2b.service.SearchService searchService;
+	private RestTempSearchService searchService;
 
 	@Autowired
 	private PurchaseOrderAllDao purchaseOrderAllDao;

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

@@ -728,7 +728,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, 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/spring/dubbo-consumer.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-	http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
-
-    <dubbo:application name="b2b_consumer" />
-
-    <dubbo:registry address="${zk.url}" check="false" />
-
-    <!-- B2B搜索服务 -->
-    <dubbo:reference id="searchService"
-                     interface="com.uas.search.b2b.service.SearchService" timeout="10000"
-                     group="${dubbo.group}" owner="${dubbo.owner}" />
-
-</beans>

src/main/resources/velocity/changeAdmin.vm

@@ -1,45 +0,0 @@
-<html>
-<head>
-<meta http-equiv="description" content="优软邮件收发中心">
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<style type="text/css">
-body {
-	width: 800px;
-	margin: 0 auto;
-}
-h4 {
-	background: #efefef;
-	padding: 5px;
-}
-h3 {
-	color: #f89406;
-}
-a {
-	color: #0088cc;
-	text-decoration: none;
-}
-.mail-content {
-	padding: 5px;
-}
-</style>
-</head>
-<body>
-	<h4>您好，<span style="color:red;">${userName}</span> </h4>
-	<div class="mail-content">
-			<p style="margin:1em 0">恭喜您的申请更换管理员成功，您成为UAS商务平台的用户，您的UU号是：<h3>${userUU}</h3></p>
-			<p style="margin:1em 0">
-				您于  <b>${dateTime}</b>已成为<b>${enName}</b>的管理员 。
-			</p>
-			<p style="margin:1em 0">
-				您可以使用您的UU号：<b>${userUU}</b> 或 手机号：<b>${userTel}</b> 或 邮箱地址：<b>${userEmail}</b> <a href="${rootpath}">
-				登陆UAS商务平台</a>，您的初始密码为：<b>111111</b>，请您及时<a href="${rootpath}">登陆UAS商务平台</a>修改密码以及完善信息。
-			</p>
-			<p style="margin:1em 0">如果您遇到帐户相关的问题或忘记了密码，我们将通过此电子邮件地址与您联系。</p>
-			<p style="margin:1em 0;text-align: right">祝您使用愉快！</p>
-			<p style="margin:1em 0;text-align: right">优软平台 研发团队敬上</p>
-			<br>
-			<hr>
-			<small style="color: #999999;">如果您有任何的疑问，请咨询<a href="${rootpath}/serve" target="_blank">客服中心</a>，联系电话：<strong>400-830-1818</strong></small>
-	</div>
-</body>
-</html>

src/main/resources/velocity/createdSaas.vm

@@ -1,49 +0,0 @@
-<html>
-<head>
-<meta http-equiv="description" content="优软邮件收发中心">
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<style type="text/css">
-body {
-	width: 800px;
-	margin: 0 auto;
-}
-h4 {
-	background: #efefef;
-	padding: 5px;
-}
-h3 {
-	color: #f89406;
-}
-a {
-	color: #0088cc;
-	text-decoration: none;
-}
-.mail-content {
-	padding: 5px;
-}
-</style>
-</head>
-<body>
-	<h4>您好，<span style="color:red;">${email}</span> </h4>
-	<div class="mail-content">
-			<p style="margin:1em 0">恭喜您成功申请优企云服！</p>
-			<p style="margin:1em 0">
-				您申请的企业&nbsp;<span style="color: #f89406;font-size:1.17em;">${name}</span>&nbsp;的优企云服的网址是：
-				<a href="http://${saasUrl}.saas.ubtob.com"><b>http://${saasUrl}.saas.ubtob.com</b></a>。
-			</p>
-			<p style="margin:1em 0">
-				您可以通过访问您的优企云服网址来初始化设置您的优企云服系统。<br>
-				初始化登录账号：ADMIN，登录密码：B2B商务管理员账号的密码。
-			</p>
-			<p style="margin:1em 0">
-				完成初始化设置之后您就可以正常使用我们为您定制的优企云服系统，登录请通过浏览器直接访问<a href="http://${saasUrl}.saas.ubtob.com"><b>http://${saasUrl}.saas.ubtob.com</b></a>。
-			</p>
-			<p style="margin:1em 0">如果您遇到帐户相关的问题或忘记了密码，我们将通过此电子邮件地址与您联系。</p>
-			<p style="margin:1em 0;text-align: right">祝您使用愉快！</p>
-			<p style="margin:1em 0;text-align: right">优软云 研发团队敬上</p>
-			<br>
-			<hr>
-			<small style="color: #999999;">如果您有任何的疑问，请咨询<a href="${rootpath}/serve" target="_blank">客服中心</a>，联系电话：<strong>400-830-1818</strong></small>
-	</div>
-</body>
-</html>

src/main/resources/velocity/forgetPwd.vm

@@ -1,43 +0,0 @@
-<html>
-<head>
-<meta http-equiv="description" content="优软邮件收发中心">
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<style type="text/css">
-body {
-	width: 800px;
-	margin: 0 auto;
-}
-h4 {
-	background: #efefef;
-	padding: 5px;
-}
-h3 {
-	color: #f89406;
-}
-a {
-	color: #0088cc;
-	text-decoration: none;
-}
-.mail-content {
-	padding: 5px;
-}
-</style>
-</head>
-<body>
-	<h4>您好，<span style="color:red;">${email}</span> </h4>
-	<div class="mail-content">
-			<p style="margin:1em 0">这是UAS商务平台用户找回密码的验证邮件。</p>
-			<p style="margin:1em 0">验证用户：${enName} - ${userName}</p>
-			<p style="margin:2em 2em">
-				您可以<a href="${rootpath}/serve#/self/forget_pwd2/${uu}/${checkcode}" target="_blank"><strong>点击这里</strong></a>&nbsp;&nbsp;或者<br>
-				复制以下链接通过浏览器打开：<b>${rootpath}/serve#/self/forget_pwd2/${uu}/${checkcode}</b>&nbsp;&nbsp;通过验证并重设验证用户的登录密码（ps：不支持IE-9以下版本浏览器）。
-			</p>
-			<p style="margin:1em 0">请在24小时内验证并设置密码。</p>
-			<p style="margin:1em 0;text-align: right">祝您使用愉快！</p>
-			<p style="margin:1em 0;text-align: right">优软UAS商务平台 研发团队敬上</p>
-			<br>
-			<hr>
-			<small style="color: #999999;">如果您有任何的疑问，请咨询<a href="${rootpath}/serve" target="_blank">客服中心</a>，联系电话：<strong>400-830-1818</strong></small>
-	</div>
-</body>
-</html>

src/main/resources/velocity/invalid.vm

@@ -1,41 +0,0 @@
-<html>
-<head>
-<meta http-equiv="description" content="优软邮件收发中心">
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<style type="text/css">
-body {
-	width: 800px;
-	margin: 0 auto;
-}
-h4 {
-	background: #efefef;
-	padding: 5px;
-}
-h3 {
-	color: #f89406;
-}
-a {
-	color: #0088cc;
-	text-decoration: none;
-}
-.mail-content {
-	padding: 5px;
-}
-</style>
-</head>
-<body>
-	<h4>您好，<span style="color:red;">${email}</span> </h4>
-	<div class="mail-content">
-			<p style="margin:1em 0">很遗憾，您注册的优软商务平台账号<h3>${name}</h3>未能通过审核,具体原因如下：</p>
-			<p style="margin:2em 0">
-				${reason}
-			</p>
-			<p style="margin:1em 0">请您重新<a href="${rootpath}/signup#/step1">填写资料注册</a></p>
-			<p style="margin:1em 0;text-align: right">祝您使用愉快！</p>
-			<p style="margin:1em 0;text-align: right">优软商务平台 研发团队敬上</p>
-			<br>
-			<hr>
-			<small style="color: #999999;">如果您有任何的疑问，请咨询<a href="${rootpath}/serve" target="_blank">客服中心</a>，联系电话：<strong>400-830-1818</strong></small>
-	</div>
-</body>
-</html>

src/main/resources/velocity/newUser.vm

@@ -1,45 +0,0 @@
-<html>
-<head>
-<meta http-equiv="description" content="优软邮件收发中心">
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<style type="text/css">
-body {
-	width: 800px;
-	margin: 0 auto;
-}
-h4 {
-	background: #efefef;
-	padding: 5px;
-}
-h3 {
-	color: #f89406;
-}
-a {
-	color: #0088cc;
-	text-decoration: none;
-}
-.mail-content {
-	padding: 5px;
-}
-</style>
-</head>
-<body>
-	<h4>您好，<span style="color:red;">${userName}</span> </h4>
-	<div class="mail-content">
-			<p style="margin:1em 0">恭喜您成为UAS商务平台的用户，您的UU号是：<h3>${userUU}</h3></p>
-			<p style="margin:1em 0">
-				<b>${enName}</b>的管理员 <b>${adminName}</b> 于 <b>${dateTime}</b> 将您添加作为UAS商务平台的用户。
-			</p>
-			<p style="margin:1em 0">
-				您可以使用您的UU号：<b>${userUU}</b> 或 手机号：<b>${userTel}</b> 或 邮箱地址：<b>${userEmail}</b> <a href="${rootpath}">
-				登陆UAS商务平台</a>，您的初始密码为：<b>111111</b>，请您及时<a href="${rootpath}">登陆UAS商务平台</a>修改密码以及完善信息。
-			</p>
-			<p style="margin:1em 0">如果您遇到帐户相关的问题或忘记了密码，我们将通过此电子邮件地址与您联系。</p>
-			<p style="margin:1em 0;text-align: right">祝您使用愉快！</p>
-			<p style="margin:1em 0;text-align: right">优软平台 研发团队敬上</p>
-			<br>
-			<hr>
-			<small style="color: #999999;">如果您有任何的疑问，请咨询<a href="${rootpath}/serve" target="_blank">客服中心</a>，联系电话：<strong>400-830-1818</strong></small>
-	</div>
-</body>
-</html>

src/main/resources/velocity/registerActivate.vm

@@ -1,48 +0,0 @@
-<html>
-<head>
-<meta http-equiv="description" content="优软邮件收发中心">
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<style type="text/css">
-body {
-	width: 800px;
-	margin: 0 auto;
-}
-h4 {
-	background: #efefef;
-	padding: 5px;
-}
-h3 {
-	color: #f89406;
-}
-a {
-	color: #0088cc;
-	text-decoration: none;
-}
-.mail-content {
-	padding: 5px;
-}
-</style>
-</head>
-<body>
-	<h4>您好，<span style="color:red;">${email}</span> </h4>
-	<div class="mail-content">
-			<p style="margin:1em 0">恭喜您成功注册优软商务平台，您注册的企业&nbsp;<span style="color: #f89406;font-size:1.17em;">${enname}</span>&nbsp;企业UU号是：<b>${uu}</b></p>
-			<p style="margin:1em 0">请你及时将您的企业UU号告知您的客户</p>
-			<p style="margin:1em 0">
-				您可以<a href="${rootpath}/signup#/step3/${uu}/${checkcode}" target="_blank"><strong>点击这里</strong></a>&nbsp;&nbsp;或者<br>
-				复制以下链接通过浏览器打开：<b>${rootpath}/signup#/step3/${uu}/${checkcode}</b>&nbsp;&nbsp;来激活您的账号。（ps：不支持IE-9以下版本浏览器）
-			</p>
-			<p style="margin:1em 0">请在24小时内激活</p>
-			<p style="margin:1em 0">
-				激活后，您可以使用您的个人UU号：<span style="color:red;"><strong>${adminUU}</strong></span>，
-				以及您的注册邮箱：<b>${email}</b>或手机号：<b>${adminTel}</b> <a href="${rootpath}">登录优软UAS商务平台</a>！
-			</p>
-			<p style="margin:1em 0">如果您遇到帐户相关的问题或忘记了密码，我们将通过此电子邮件地址与您联系。</p>
-			<p style="margin:1em 0;text-align: right">祝您使用愉快！</p>
-			<p style="margin:1em 0;text-align: right">优软UAS商务平台 研发团队敬上</p>
-			<br>
-			<hr>
-			<small style="color: #999999;">如果您有任何的疑问，请咨询<a href="${rootpath}/serve" target="_blank">客服中心</a>，联系电话：<strong>400-830-1818</strong></small>
-	</div>
-</body>
-</html>

src/main/resources/velocity/registerActivateSaas.vm

@@ -1,53 +0,0 @@
-<html>
-<head>
-<meta http-equiv="description" content="优软邮件收发中心">
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<style type="text/css">
-body {
-	width: 800px;
-	margin: 0 auto;
-}
-h4 {
-	background: #efefef;
-	padding: 5px;
-}
-h3 {
-	color: #f89406;
-}
-a {
-	color: #0088cc;
-	text-decoration: none;
-}
-.mail-content {
-	padding: 5px;
-}
-</style>
-</head>
-<body>
-	<h4>您好，<span style="color:red;">${email}</span> </h4>
-	<div class="mail-content">
-			<p style="margin:1em 0">恭喜您成功注册B2B商务并申请优企云服，您注册的企业&nbsp;<span style="color: #f89406;font-size:1.17em;">${enname}</span>&nbsp;企业UU号是：<b>${uu}</b></p>
-			<p style="margin:1em 0">请你及时将您的企业UU号告知您的客户</p>
-			<p style="margin:1em 0">
-				您可以<a href="${rootpath}/signup#/step3/${uu}/${checkcode}" target="_blank"><strong>点击这里</strong></a>&nbsp;&nbsp;或者<br>
-				复制以下链接通过浏览器打开：<b>${rootpath}/signup#/step3/${uu}/${checkcode}</b>&nbsp;&nbsp;来激活您的优软云账号。（ps：不支持IE-9以下版本浏览器，推荐使用Google Chrome浏览器）
-			</p>
-			<p style="margin:1em 0">请在24小时内激活</p>
-			<p style="margin:1em 0">
-				激活后，您可以通过访问您的优企云服系统网址：<a href="http://${saasUrl}.saas.ubtob.com"><b>http://${saasUrl}.saas.ubtob.com</b></a> 来初始化设置您的优企云服系统。<br>
-				完成初始化设置之后您就可以正常使用我们为您定制的优企云服，登录请通过浏览器直接访问<a href="http://${saasUrl}.saas.ubtob.com"><b>http://${saasUrl}.saas.ubtob.com</b></a>。<br>
-				初始化登录账号：ADMIN，登录密码：您激活时设置的密码。
-			</p>
-			<p style="margin:1em 0">
-				您也可以使用您的个人UU号：<span style="color:red;"><strong>${adminUU}</strong></span>，
-				以及您的注册邮箱：<b>${email}</b>或手机号：<b>${adminTel}</b> <a href="${rootpath}">登录优软云</a>！
-			</p>
-			<p style="margin:1em 0">如果您遇到帐户相关的问题或忘记了密码，我们将通过此电子邮件地址与您联系。</p>
-			<p style="margin:1em 0;text-align: right">祝您使用愉快！</p>
-			<p style="margin:1em 0;text-align: right">优软云 研发团队敬上</p>
-			<br>
-			<hr>
-			<small style="color: #999999;">如果您有任何的疑问，请咨询<a href="${rootpath}/serve" target="_blank">客服中心</a>，联系电话：<strong>400-830-1818</strong></small>
-	</div>
-</body>
-</html>