From 85eb594e26bed5e6f0402e541d23a6fa9b82e0bc Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 19 Feb 2019 13:13:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=BC=80=E5=8F=91=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0][=E4=BF=AE=E6=94=B9]:=E5=B7=B2=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxWeappInfoController.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 973b024fb..c40c2f795 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -33,6 +33,7 @@ import me.chanjar.weixin.open.bean.result.WxOpenMaDomainResult; import me.chanjar.weixin.open.bean.result.WxOpenMaQueryAuditResult; import me.chanjar.weixin.open.bean.result.WxOpenMaSubmitAuditResult; import me.chanjar.weixin.open.bean.result.WxOpenResult; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -427,7 +428,13 @@ public class WxWeappInfoController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData releaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxWeappController::releaseStatusList"); - if (null == weappCodeStatusVo) weappCodeStatusVo = new WxWeappCodeStatusVo(); + if (null == weappCodeStatusVo) { + weappCodeStatusVo = new WxWeappCodeStatusVo(); + } else { + if(StringUtils.isBlank(weappCodeStatusVo.getAppId())) { + weappCodeStatusVo.setAppId(null); + } + } weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.UserVersion_DESC); final PageInfo page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); return new ResultData(page); @@ -437,7 +444,13 @@ public class WxWeappInfoController extends BaseController { @GetMapping("releaseStatusAllList") public ResultData getReleaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo) { logger.debug("[" + getIpAddr() + "] WxWeappController::releaseStatusAllList"); - if (null == weappCodeStatusVo) weappCodeStatusVo = new WxWeappCodeStatusVo(); + if (null == weappCodeStatusVo) { + weappCodeStatusVo = new WxWeappCodeStatusVo(); + } else { + if(StringUtils.isBlank(weappCodeStatusVo.getAppId())) { + weappCodeStatusVo.setAppId(null); + } + } weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.UserVersion_DESC); final List list = weappCodeStatusService.getList(weappCodeStatusVo); return new ResultData(list);