From 5b73f899c41957496ee0e4257a8e8bd38fc51d37 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 九月 2026 14:50:10 +0800
Subject: [PATCH] 天津-智科电子 1.协同办公-协同审批:待审批节点,第三人账号不可进行修改 2.营销管理-销售台账:勾选单个导出会出现整个导出的情况,但只能显示父项、不能显示子项 3.营销管理-销售台账:点击下拉没有价格,点击详情有价格

---
 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