From 519886a70d630e3cdd6c0f40f55fcebc6e780dc5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 17:45:11 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
index 4118058..c8fdc16 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import com.ruoyi.project.service.IServiceDonatecomporganService;
import io.swagger.annotations.Api;
@@ -16,7 +15,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -40,7 +38,7 @@
* 鏌ヨ鎹愮尞鍣ㄥ畼绉绘鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼绉绘鍒楄〃")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:list')")
+ // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatecomporgan serviceDonatecomporgan) {
startPage();
@@ -52,7 +50,7 @@
* 瀵煎嚭鎹愮尞鍣ㄥ畼绉绘鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼绉绘鍒楄〃")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:export')")
+ // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:export')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatecomporgan serviceDonatecomporgan) {
@@ -65,7 +63,7 @@
* 鑾峰彇鎹愮尞鍣ㄥ畼绉绘璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎹愮尞鍣ㄥ畼绉绘璇︾粏淇℃伅")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:query')")
+ // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonatecomporganService.getById(id));
@@ -75,19 +73,20 @@
* 鏂板鎹愮尞鍣ㄥ畼绉绘
*/
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼绉绘")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:add')")
+ // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:add')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonatecomporgan serviceDonatecomporgan) {
- return toAjax(serviceDonatecomporganService.save(serviceDonatecomporgan));
+ boolean save = serviceDonatecomporganService.save(serviceDonatecomporgan);
+ return AjaxResult.success(serviceDonatecomporgan);
}
/**
* 淇敼鎹愮尞鍣ㄥ畼绉绘
*/
@ApiOperation("淇敼鎹愮尞鍣ㄥ畼绉绘")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:edit')")
+ // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:edit')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -99,7 +98,7 @@
* 鍒犻櫎鎹愮尞鍣ㄥ畼绉绘
*/
@ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼绉绘")
- // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:remove')")
+ // @PreAuthorize("@ss.hasPermi('project:donatecomporgan:remove')")
@Log(title = "鎹愮尞鍣ㄥ畼绉绘", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -112,7 +111,7 @@
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdateDonatecomporgan")
public AjaxResult saveOrUpdateDonatecomporgan(@RequestBody List<ServiceDonatecomporgan> serviceDonatecomporganList) {
- if (CollectionUtils.isNotEmpty(serviceDonatecomporganList)) {
+ if (CollectionUtils.isEmpty(serviceDonatecomporganList)) {
throw new BaseException("璇锋鏌ラ渶瑕佹柊澧炴垨淇敼鐨勫弬鏁版槸鍚﹀畬鏁�");
}
Boolean i = null;
--
Gitblit v1.9.3