From 8c215c8be0f5076e8c95daf1b2203440ca7dfcad Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 13:42:50 +0800
Subject: [PATCH] 修改了报销校验
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
index 0df3b16..1a9cf4c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
@@ -40,7 +40,7 @@
* 鏌ヨ鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃")
-// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:list')")
+// // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
startPage();
@@ -52,7 +52,7 @@
* 瀵煎嚭鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼鑾峰彇鍒楄〃")
-// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:export')")
+// // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:export')")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
@@ -65,7 +65,7 @@
* 鑾峰彇鎹愮尞鍣ㄥ畼鑾峰彇璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎹愮尞鍣ㄥ畼鑾峰彇璇︾粏淇℃伅")
-// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:query')")
+// // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonationwitnessorganService.getById(id));
@@ -75,7 +75,7 @@
* 鏂板鎹愮尞鍣ㄥ畼鑾峰彇
*/
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼鑾峰彇")
-// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:add')")
+// // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:add')")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
@@ -88,7 +88,7 @@
* 淇敼鎹愮尞鍣ㄥ畼鑾峰彇
*/
@ApiOperation("淇敼鎹愮尞鍣ㄥ畼鑾峰彇")
-// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:edit')")
+// // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:edit')")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -100,7 +100,7 @@
* 鍒犻櫎鎹愮尞鍣ㄥ畼鑾峰彇
*/
@ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼鑾峰彇")
-// @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:remove')")
+// // @PreAuthorize("@ss.hasPermi('project:donationwitnessorgan:remove')")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -122,6 +122,7 @@
ServiceDonationwitnessorgan serviceDonationwitnessorgan2 = new ServiceDonationwitnessorgan();
serviceDonationwitnessorgan2.setInfoid(serviceDonationwitnessorgan.getInfoid());
serviceDonationwitnessorgan2.setOrganno(serviceDonationwitnessorgan.getOrganno());
+ serviceDonationwitnessorgan2.setDel_flag(0);
List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganService.queryList(serviceDonationwitnessorgan2);
log.info("serviceDonationwitnessorgans鐨勬暟閲忎负 : {},infoid涓猴細{}锛孫rganno涓猴細{}", serviceDonationwitnessorgans.size(), serviceDonationwitnessorgan.getInfoid(), serviceDonationwitnessorgan.getOrganno());
if (!CollectionUtils.isEmpty(serviceDonationwitnessorgans)) {
@@ -133,6 +134,7 @@
i = serviceDonationwitnessorganService.updateById(serviceDonationwitnessorgan);
}
}
- return toAjax(i);
+ // 鍥炰紶甯︿富閿殑鍒楄〃锛屼究浜庡墠绔洖濉� id
+ return AjaxResult.success(serviceDonationwitnessorganList);
}
}
--
Gitblit v1.9.3