From e79ebf83dc445b0ed459e8c9b2b1a95c1f204cd2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 26 五月 2026 10:10:40 +0800
Subject: [PATCH] 关联销售台账或者销售退货的客户不能被删除

---
 src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
index fa72a40..3673208 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
@@ -4,8 +4,7 @@
 import com.ruoyi.collaborativeApproval.dto.StaffContactsPersonalDTO;
 import com.ruoyi.collaborativeApproval.pojo.StaffContactsPersonal;
 import com.ruoyi.collaborativeApproval.service.StaffContactsPersonalService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -13,27 +12,27 @@
 @RestController
 @RequestMapping("/staffContactsPersonal")
 @AllArgsConstructor
-public class StaffContactsPersonalController extends BaseController {
+public class StaffContactsPersonalController {
     private StaffContactsPersonalService staffContactsPersonalService;
 
     @GetMapping("/getList")
     @Operation(summary = "鍒嗛〉鏌ヨ")
-    public R<?> listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
-        return R.ok(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
+    public AjaxResult listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
+        return AjaxResult.success(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
     }
 
     @PostMapping("/add")
     @Operation(summary = "鏂板")
-    public R<?> add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
-        return R.ok(staffContactsPersonalService.save(staffContactsPersonal));
+    public AjaxResult add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
+        return AjaxResult.success(staffContactsPersonalService.save(staffContactsPersonal));
     }
 
     @DeleteMapping("/delete/{id}")
     @Operation(summary = "鍒犻櫎")
-    public R<?> delete(@PathVariable("id") Long id) {
+    public AjaxResult delete(@PathVariable("id") Long id) {
 //        if (CollectionUtils.isEmpty(id)) {
 //            throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
 //        }
-        return R.ok(staffContactsPersonalService.removeById(id));
+        return AjaxResult.success(staffContactsPersonalService.removeById(id));
     }
 }

--
Gitblit v1.9.3