|
@@ -4,6 +4,7 @@ import java.text.ParseException;
|
|
|
import java.util.List;
|
|
|
import java.util.Arrays;
|
|
|
|
|
|
+import cn.hutool.core.lang.Validator;
|
|
|
import com.zhongzheng.common.utils.ServletUtils;
|
|
|
import com.zhongzheng.framework.web.service.WxTokenService;
|
|
|
import com.zhongzheng.modules.user.entity.ClientLoginUser;
|
|
@@ -130,6 +131,9 @@ public class UserMockSubscribeController extends BaseController {
|
|
|
ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
|
|
|
bo.setUserId(loginUser.getUser().getUserId());
|
|
|
List<UserMockSubscribeVo> list = iUserMockSubscribeService.listSubscribe(bo);
|
|
|
+ if (Validator.isEmpty(bo.getPageNum()) || Validator.isEmpty(bo.getPageSize())) {
|
|
|
+ return getDataTable(list);
|
|
|
+ }
|
|
|
return getDataTable(getPageInfo(bo.getPageNum(), bo.getPageSize(), list).getList());
|
|
|
}
|
|
|
|