From 21f11949452248769ca26f4c4dfb97a3cd642a10 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 28 五月 2024 16:24:00 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java index 957db51..6f677b7 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java @@ -3,6 +3,8 @@ import com.doumee.api.BaseController; import com.doumee.config.annotation.LoginNoRequired; import com.doumee.core.annotation.trace.Trace; +import com.doumee.core.constants.ResponseStatus; +import com.doumee.core.exception.BusinessException; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; @@ -23,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -97,9 +100,7 @@ @ApiOperation("璁垮璁板綍 - 鍒嗛〉鍒楄〃") @PostMapping("/visitPage") - public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { - LoginUserInfo loginUserInfo = getLoginUser(token); - pageWrap.getModel().setMemberId(loginUserInfo.getMemberId()); + public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap) { return ApiResponse.success(visitsService.findPage(pageWrap)); } -- Gitblit v1.9.3