From bee96a1d36c86068cd5a7eb69f4e3294a8123b04 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 03 七月 2026 18:02:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
index 33e8d84..84d31ab 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
@@ -138,6 +138,26 @@
                         .setCustomerId(business.getCustomerId())));
     }
 
+    @GetMapping("/list-by-customer")
+    @Operation(summary = "鑾峰緱鍟嗘満鍒楄〃锛屽熀浜庢寚瀹氬鎴�")
+    @Parameter(name = "customerId", description = "瀹㈡埛缂栧彿", required = true)
+    @PreAuthorize("@ss.hasPermission('crm:business:query')")
+    public CommonResult<List<CrmBusinessRespVO>> getBusinessListByCustomer(@RequestParam("customerId") Long customerId) {
+        List<CrmBusinessDO> list = businessService.getBusinessListByCustomerId(customerId);
+        return success(convertList(list, business -> // 鍙繑鍥� id銆乶ame 瀛楁
+                new CrmBusinessRespVO().setId(business.getId()).setName(business.getName())
+                        .setCustomerId(business.getCustomerId())));
+    }
+
+    @GetMapping("/list-by-contact")
+    @Operation(summary = "鑾峰緱鍟嗘満鍒楄〃锛屽熀浜庢寚瀹氳仈绯讳汉")
+    @Parameter(name = "contactId", description = "鑱旂郴浜虹紪鍙�", required = true)
+    @PreAuthorize("@ss.hasPermission('crm:business:query')")
+    public CommonResult<List<CrmBusinessRespVO>> getBusinessListByContact(@RequestParam("contactId") Long contactId) {
+        List<CrmBusinessDO> list = businessService.getBusinessListByContact(contactId);
+        return success(buildBusinessDetailList(list));
+    }
+
     @GetMapping("/page")
     @Operation(summary = "鑾峰緱鍟嗘満鍒嗛〉")
     @PreAuthorize("@ss.hasPermission('crm:business:query')")

--
Gitblit v1.9.3