Просмотр исходного кода

【后台】+【送货提醒, 去除转码】

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@4163 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
aof 10 лет назад
Родитель
Сommit
dd1122d7e0

+ 5 - 6
src/main/java/com/uas/platform/b2b/controller/SaleNoticeController.java

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
 import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.model.SaleSend;
 import com.uas.platform.b2b.model.SaleSendAll;
@@ -73,7 +72,7 @@ public class SaleNoticeController {
 		if(filter != null && filter.getDistribute() == null) {
 			return null;
 		}
-		return purchaseNoticeService.findAllByPageInfo(info, SearchKeyUtils.decodeURL(keyword), fromDate, endDate, filter);
+		return purchaseNoticeService.findAllByPageInfo(info, keyword, fromDate, endDate, filter);
 	}
 
 	/**
@@ -125,7 +124,7 @@ public class SaleNoticeController {
 		if(filter != null && filter.getDistribute() == null) {
 			return null;
 		}
-		return purchaseNoticeService.findAllByPageInfo(info, SearchKeyUtils.decodeURL(keyword), fromDate, endDate, filter);
+		return purchaseNoticeService.findAllByPageInfo(info, keyword, fromDate, endDate, filter);
 	}
 
 	/**
@@ -144,7 +143,7 @@ public class SaleNoticeController {
 		info.filter("status", Status.REPLIED.value());
 		// 我作为卖家,把我的企业ID作为供应商ID传入
 		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		return purchaseNoticeService.findDoneByPageInfo(info, SearchKeyUtils.decodeURL(keyword), fromDate, endDate);
+		return purchaseNoticeService.findDoneByPageInfo(info, keyword, fromDate, endDate);
 	}
 
 	/**
@@ -168,7 +167,7 @@ public class SaleNoticeController {
 		if(filter != null && filter.getDistribute() == null) {
 			return null;
 		}
-		return purchaseNoticeService.findAllByPageInfo(info, SearchKeyUtils.decodeURL(keyword), fromDate, endDate, filter);
+		return purchaseNoticeService.findAllByPageInfo(info, keyword, fromDate, endDate, filter);
 	}
 
 	/**
@@ -192,7 +191,7 @@ public class SaleNoticeController {
 		if(filter != null && filter.getDistribute() == null) {
 			return null;
 		}
-		return purchaseNoticeService.findAllByPageInfo(info, SearchKeyUtils.decodeURL(keyword), fromDate, endDate, filter);
+		return purchaseNoticeService.findAllByPageInfo(info, keyword, fromDate, endDate, filter);
 	}
 
 	/**