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/VisitReasonCloudController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitReasonCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitReasonCloudController.java
index e000c3f..e0b9cd4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitReasonCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitReasonCloudController.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.VisitReason;
import com.doumee.service.business.VisitReasonService;
@@ -36,6 +36,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:visitreason:create")
public ApiResponse create(@RequestBody VisitReason visitReason,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ visitReason.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(visitReasonService.create(visitReason));
}
@@ -43,7 +44,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:visitreason:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- visitReasonService.deleteById(id);
+ visitReasonService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -56,7 +57,7 @@
for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
- visitReasonService.deleteByIdInBatch(idList);
+ visitReasonService.deleteByIdInBatch(idList,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -64,6 +65,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:visitreason:update")
public ApiResponse updateById(@RequestBody VisitReason visitReason,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ visitReason.setLoginUserInfo(this.getLoginUser(token));
visitReasonService.updateById(visitReason);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3