From 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 18 九月 2024 15:19:55 +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/admin/VisitsCloudController.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java index 8e69cbf..1178e83 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java @@ -19,6 +19,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -97,7 +98,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:visits:query") public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ - pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId()); +// pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId()); return ApiResponse.success(visitsService.findPage(pageWrap)); } @@ -151,7 +152,12 @@ return ApiResponse.success("閲嶇疆鎴愬姛"); } - - + @ApiOperation("閲嶆柊涓嬪彂澶辫触鐨勯绾�") + @GetMapping("/visitResend") + @CloudRequiredPermission("business:visits:update") + public ApiResponse visitResend(@RequestParam Integer visitId) { + visitsService.visitResend(visitId); + return ApiResponse.success(null); + } } -- Gitblit v1.9.3