diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 5f7b2af11..117ad7ca1 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -89,7 +89,13 @@ public class WxWeappInfoController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxWeappInfo weappInfo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::list"); - if (null == weappInfo) weappInfo = new WxWeappInfo(); + if (null == weappInfo) { + weappInfo = new WxWeappInfo(); + } else { + if(StringUtils.isBlank(weappInfo.getName())) { + weappInfo.setName(null); + } + } weappInfo.setSortColumns(WxWeappInfo.Field.Name_ASC,WxWeappInfo.Field.Type_ASC); final PageInfo page = authorizerInfoService.listVoAsPage(weappInfo, pageNum, pageSize); return new ResultData(page); @@ -99,7 +105,13 @@ public class WxWeappInfoController extends BaseController { @GetMapping("allist") public ResultData getList(@ModelAttribute WxWeappInfo weappInfo) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::list"); - if (null == weappInfo) weappInfo = new WxWeappInfo(); + if (null == weappInfo) { + weappInfo = new WxWeappInfo(); + } else { + if(StringUtils.isBlank(weappInfo.getName())) { + weappInfo.setName(null); + } + } weappInfo.setSortColumns(WxAuthorizerInfo.Field.CurrentVersion_DESC); final List list = authorizerInfoService.getList(weappInfo); return new ResultData(list); @@ -819,6 +831,9 @@ public class WxWeappInfoController extends BaseController { if(StringUtils.isBlank(weappCodeStatusVo.getAppId())) { weappCodeStatusVo.setAppId(null); } + if(StringUtils.isBlank(weappCodeStatusVo.getName())) { + weappCodeStatusVo.setName(null); + } } weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.UserVersion_DESC); final PageInfo page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); @@ -838,6 +853,9 @@ public class WxWeappInfoController extends BaseController { if(StringUtils.isBlank(weappAuditStatusVo.getAppId())) { weappAuditStatusVo.setAppId(null); } + if(StringUtils.isBlank(weappAuditStatusVo.getName())) { + weappAuditStatusVo.setName(null); + } } weappAuditStatusVo.setSortColumns(WxWeappAuditStatus.Field.UserVersion_DESC); final PageInfo page = weappAuditStatusService.listAsPage(weappAuditStatusVo, pageNum, pageSize); @@ -857,6 +875,9 @@ public class WxWeappInfoController extends BaseController { if(StringUtils.isBlank(weappReleaseStatusVo.getAppId())) { weappReleaseStatusVo.setAppId(null); } + if(StringUtils.isBlank(weappReleaseStatusVo.getName())) { + weappReleaseStatusVo.setName(null); + } } weappReleaseStatusVo.setSortColumns(WxWeappReleaseStatus.Field.UserVersion_DESC); final PageInfo page = weappReleaseStatusService.listAsPage(weappReleaseStatusVo, pageNum, pageSize);