From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 28 八月 2024 09:22:52 +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/ApproveTemplCloudController.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java index 76addf2..2fc63a8 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ApproveTemplCloudController.java @@ -95,11 +95,21 @@ templ.setType(type); return ApiResponse.success(approveTemplService.findOne(templ)); } - - @ApiOperation("鏍规嵁ID鏌ヨ") - @GetMapping("/{id}") + @ApiOperation("鏍规嵁reasonId鏌ヨ") + @GetMapping("/findById/{id}") @CloudRequiredPermission("business:approvetempl:query") - public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ - return ApiResponse.success(approveTemplService.findById(id)); + public ApiResponse<ApproveTempl> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + ApproveTempl templ =new ApproveTempl(); + templ.setIsdeleted(Constants.ZERO); + templ.setId(id); + return ApiResponse.success(approveTemplService.findOne(templ)); } + + +// @ApiOperation("鏍规嵁ID鏌ヨ") +// @GetMapping("/{id}") +// @CloudRequiredPermission("business:approvetempl:query") +// public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ +// return ApiResponse.success(approveTemplService.findById(id)); +// } } -- Gitblit v1.9.3