From 3d3620b81b9c2ae8e8f41ef542f0e5fa8ae43c00 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 06 三月 2025 10:53:27 +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/api/business/ApproveTemplController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java index cc3e9f8..bc338c3 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java @@ -2,9 +2,9 @@ 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.PageWrap; -import com.doumee.core.model.PageData; +import com.doumee.service.business.third.model.ApiResponse; +import com.doumee.service.business.third.model.PageWrap; +import com.doumee.service.business.third.model.PageData; import com.doumee.dao.business.model.ApproveTempl; import com.doumee.service.business.ApproveTemplService; import io.swagger.annotations.Api; @@ -39,7 +39,7 @@ @GetMapping("/delete/{id}") @RequiresPermissions("business:approvetempl:delete") public ApiResponse deleteById(@PathVariable Integer id) { - approveTemplService.deleteById(id); + approveTemplService.deleteById(id,this.getLoginUser(null)); return ApiResponse.success(null); } @@ -47,7 +47,7 @@ @GetMapping("/delete/batch") @RequiresPermissions("business:approvetempl:delete") public ApiResponse deleteByIdInBatch(@RequestParam String ids) { - approveTemplService.deleteByIdInBatch(this.getIdList(ids)); + approveTemplService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(null)); return ApiResponse.success(null); } -- Gitblit v1.9.3