From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java
index 0037c02..46f902d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcVacationManagementController.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.mdc.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -58,6 +59,9 @@
@ApiOperation(value = "鍋囨湡绠＄悊-鏂板", notes = "鍋囨湡绠＄悊-鏂板")
@PostMapping("/addVacation")
public Result<?> addVacation(@RequestBody MdcVacationManagement mdcVacationManagement) {
+ if (StringUtils.isBlank(mdcVacationManagement.getEquipmentIds())) {
+ return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡");
+ }
boolean flag = mdcVacationManagementService.addVacation(mdcVacationManagement);
return flag ? Result.ok("鏂板鎴愬姛") : Result.error("鏂板澶辫触");
}
@@ -111,9 +115,13 @@
* @param mdcVacationManagement
* @return
*/
+ @AutoLog(value = "鍋囨湡绠＄悊-瀵煎嚭excel")
+ @ApiOperation(value = "鍋囨湡绠＄悊-瀵煎嚭excel",notes = "鍋囨湡绠＄悊-瀵煎嚭excel")
@RequestMapping("/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MdcVacationManagement mdcVacationManagement) {
- return super.exportXls(request, mdcVacationManagement, MdcVacationManagement.class, "鍋囨湡绠＄悊瀵煎嚭");
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return mdcVacationManagementService.exportXls(userId, mdcVacationManagement);
}
/**
--
Gitblit v1.9.3