From 4215ced06b40268e9f3c8ef6915998fbe64013b4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 24 十月 2024 09:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
index aaaaa1b..36f07d5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
@@ -3,6 +3,8 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.TravelDetail;
+import com.ruoyi.service.TravelCountSharService;
+import com.ruoyi.service.TravelDetailDownlService;
import com.ruoyi.service.TravelDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +27,12 @@
@Autowired
TravelDetailService travelDetailService;
+
+ @Autowired
+ TravelDetailDownlService travelDetailDownlService;
+
+ @Autowired
+ TravelCountSharService travelCountSharService;
@GetMapping("/{cid}")
public AjaxResult getDataByCid(@PathVariable("cid") Long cid,TravelDetail travelDetail){
@@ -55,6 +63,9 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ if (! (travelDetailDownlService.deleteData(ids) && travelCountSharService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
travelDetailService.removeByIds(Arrays.asList(ids));
return AjaxResult.success();
}
--
Gitblit v1.9.1