From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java
index 9e5dcce..88ca13c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java
@@ -4,9 +4,9 @@
 import com.doumee.config.annotation.CloudRequiredPermission;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.business.model.Position;
 import com.doumee.service.business.PositionService;
@@ -34,7 +34,7 @@
     @PreventRepeat
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
-    @CloudRequiredPermission("business:visitreason:create")
+    @CloudRequiredPermission("business:position:create")
     public ApiResponse create(@RequestBody Position position,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         position.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(positionService.create(position));
@@ -42,7 +42,7 @@
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
-    @CloudRequiredPermission("business:visitreason:delete")
+    @CloudRequiredPermission("business:position:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         positionService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
@@ -50,7 +50,7 @@
 
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
-    @CloudRequiredPermission("business:visitreason:delete")
+    @CloudRequiredPermission("business:position:delete")
     public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
@@ -63,7 +63,7 @@
 
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
-    @CloudRequiredPermission("business:visitreason:update")
+    @CloudRequiredPermission("business:position:update")
     public ApiResponse updateById(@RequestBody Position position,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         position.setLoginUserInfo(this.getLoginUser(token));
         positionService.updateById(position);
@@ -72,27 +72,27 @@
 
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
-    @CloudRequiredPermission("business:visitreason:query")
+    @CloudRequiredPermission("business:position:query")
     public ApiResponse<PageData<Position>> findPage (@RequestBody PageWrap<Position> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(positionService.findPage(pageWrap));
     }
     @ApiOperation("鏌ヨ鍏ㄩ儴")
     @PostMapping("/list")
-    @CloudRequiredPermission("business:visitreason:query")
+    @CloudRequiredPermission("business:position:query")
     public ApiResponse<List<Position>> findList (@RequestBody Position  pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(positionService.findList(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
-    @CloudRequiredPermission("business:visitreason:exportExcel")
+    @CloudRequiredPermission("business:position:exportExcel")
     public void exportExcel (@RequestBody PageWrap<Position> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         ExcelExporter.build(Position.class).export(positionService.findPage(pageWrap).getRecords(), "璁垮浜嬬敱淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
-    @CloudRequiredPermission("business:visitreason:query")
+    @CloudRequiredPermission("business:position:query")
     public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(positionService.findById(id));
     }

--
Gitblit v1.9.3