From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java | 23 ++++++++++++++++-------
1 files changed, 16 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 80695f9..b2e5e4a 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) {
@@ -108,7 +108,6 @@
}
- @RepeatSubmit
@ApiOperation("鏂板鎴栦慨鏀规崘鐚櫒瀹樿幏鍙�")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdateDonationwitnessorgan")
@@ -119,6 +118,16 @@
Boolean i = null;
for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessorganList) {
log.info("鎹愮尞鍣ㄥ畼鑾峰彇id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonationwitnessorgan.getId(), serviceDonationwitnessorgan.getInfoid());
+ //鏍规嵁infoid鍜屽櫒瀹樼紪鍙凤紝鍒ゆ柇杩欎釜鍣ㄥ畼鏄惁宸茬粡瀛樿繘琛ㄤ腑
+ 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)) {
+ serviceDonationwitnessorgan.setId(serviceDonationwitnessorgans.get(0).getId());
+ }
if (serviceDonationwitnessorgan.getId() == null) {
i = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
} else {
--
Gitblit v1.9.3