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/CarUseBookCloudController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
index 575fb48..1cb579b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
@@ -4,10 +4,12 @@
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.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+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.CarUseBook;
import com.doumee.dao.business.vo.DateIntervalVO;
@@ -19,6 +21,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.Objects;
/**
* @author 姹熻箘韫�
@@ -39,6 +42,9 @@
public ApiResponse create(@RequestBody CarUseBook carUseBook,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) throws Exception {
LoginUserInfo loginUserInfo = getLoginUser(token);
carUseBook.setCreator(loginUserInfo.getId());
+ if(Objects.isNull(loginUserInfo.getMemberId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲唴閮ㄤ汉鍛樻棤娉曡繘琛岃鎿嶄綔");
+ }
carUseBook.setMemberId(loginUserInfo.getMemberId());
return ApiResponse.success(carUseBookService.create(carUseBook));
}
@@ -47,7 +53,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:carusebook:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- carUseBookService.deleteById(id);
+ carUseBookService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -80,6 +86,7 @@
@CloudRequiredPermission("business:carusebook:exportExcel")
public void exportExcel (@RequestBody PageWrap<CarUseBook> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
+ pageWrap.setCapacity(9999);
ExcelExporter.build(CarUseBook.class).export(carUseBookService.findPage(pageWrap).getRecords(), "杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�", response);
}
--
Gitblit v1.9.3