| @@ -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.WxOpenMaQueryAuditResult; | ||||
| import me.chanjar.weixin.open.bean.result.WxOpenMaSubmitAuditResult; | import me.chanjar.weixin.open.bean.result.WxOpenMaSubmitAuditResult; | ||||
| import me.chanjar.weixin.open.bean.result.WxOpenResult; | import me.chanjar.weixin.open.bean.result.WxOpenResult; | ||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | 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)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| public ResultData releaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo, Integer pageNum, Integer pageSize) { | public ResultData releaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxWeappController::releaseStatusList"); | 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); | weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.UserVersion_DESC); | ||||
| final PageInfo<WxWeappCodeStatusVo> page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); | final PageInfo<WxWeappCodeStatusVo> page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -437,7 +444,13 @@ public class WxWeappInfoController extends BaseController { | |||||
| @GetMapping("releaseStatusAllList") | @GetMapping("releaseStatusAllList") | ||||
| public ResultData getReleaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo) { | public ResultData getReleaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo) { | ||||
| logger.debug("[" + getIpAddr() + "] WxWeappController::releaseStatusAllList"); | 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); | weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.UserVersion_DESC); | ||||
| final List<WxWeappCodeStatusVo> list = weappCodeStatusService.getList(weappCodeStatusVo); | final List<WxWeappCodeStatusVo> list = weappCodeStatusService.getList(weappCodeStatusVo); | ||||
| return new ResultData(list); | return new ResultData(list); | ||||