From 43ae450db3ce85b425169e4fcef6ac7c25407f52 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 28 十月 2019 09:47:37 +0800
Subject: [PATCH] 2.0.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
index ed5e9d0..bbbd733 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
@@ -349,7 +349,7 @@
* @param acceptData
* @param out
*/
- @RequestMapping(value = "getList", method = RequestMethod.POST)
+// @RequestMapping(value = "getList", method = RequestMethod.POST)
public void getList(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult("椤电爜涓嶆纭�"));
@@ -391,7 +391,7 @@
* @param acceptData
* @param out
*/
- @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
+// @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
public void getShopInfoV2(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {
if (id == null) {
@@ -551,7 +551,7 @@
* 绮鹃��1锛� 瓒宠抗鍒楄〃2
* @param out
*/
- @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
+// @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
public void getHistoryV2(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
if (type == null) {
out.print(JsonUtil.loadFalseResult("绫诲瀷涓嶆纭�"));
@@ -623,7 +623,7 @@
* @param acceptData
* @param out
*/
- @RequestMapping(value = "getListV3", method = RequestMethod.POST)
+ @RequestMapping(value = "getList", method = RequestMethod.POST)
public void getListV3(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult("椤电爜涓嶆纭�"));
@@ -666,7 +666,7 @@
* @param acceptData
* @param out
*/
- @RequestMapping(value = "getShopInfoV3", method = RequestMethod.POST)
+ @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
public void getShopInfoV3(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {
if (id == null) {
out.print(JsonUtil.loadFalseResult("缂哄け搴楅摵id"));
@@ -739,7 +739,7 @@
* 绮鹃��1锛� 瓒宠抗鍒楄〃2
* @param out
*/
- @RequestMapping(value = "getHistoryV3", method = RequestMethod.POST)
+ @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
public void getHistoryV3(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
if (type == null) {
out.print(JsonUtil.loadFalseResult("绫诲瀷涓嶆纭�"));
@@ -762,7 +762,8 @@
List<BrandInfo> list = new ArrayList<BrandInfo>();
if (listRecord != null && listRecord.size() > 0) {
for (BrandInfoRecord history : listRecord) {
- list.add(history.getBrandInfo());
+ if (history.getBrandInfo() != null)
+ list.add(history.getBrandInfo());
}
}
--
Gitblit v1.8.0