2024-05-23-4提交

yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customerContacts/CustomerContactsController.java

@@ -132,6 +132,7 @@ public class CustomerContactsController {
         ExcelUtils.write(response, "客户联系人.xls", "数据", CustomerContactsExcelVO.class, datas);
     }
 
+
     @GetMapping("/select")
     @ApiOperation("获得客户联系人下拉框列表(单次最多显示20条，请输入联系人电话、联系人姓名、客户名称搜索)")
     @ApiImplicitParams({
@@ -147,6 +148,30 @@ public class CustomerContactsController {
             @RequestParam(value = "customerId", required = false) Long customerId
             , PageParam page) {
 
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        return success(customerContactsService.selectBySearchKey(searchKey,
+                type,  ids, customerId, page));
+    }
+
+    /*
+     lanbm 2024-05-23 添加的新的功能接口
+     用于报价单逻辑控制
+     */
+    @GetMapping("/select2")
+    @ApiOperation("获得客户联系人下拉框列表(单次最多显示20条，请输入联系人电话、联系人姓名、客户名称搜索)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "searchKey", value = "请输入联系人电话、联系人姓名、客户名称搜索", example = "姓名或电话", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "type", value = "客户类型", example = "姓名或电话", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "ids", value = "编号列表", example = "1024,2048", dataTypeClass = List.class),
+            @ApiImplicitParam(name = "customerId", value = "客户ID", example = "1024", dataTypeClass = Long.class)
+    })
+    public CommonResult<PageResult<CustomerContactsDto>> selectBySearchKey2(
+            @RequestParam(value = "searchKey", required = false) String searchKey,
+            @RequestParam(value = "type", required = false) String type,
+            @RequestParam(value = "ids", required = false) Collection<Long> ids,
+            @RequestParam(value = "customerId", required = false) Long customerId
+            , PageParam page) {
+
         //lanbm 2024-05-22修改报价单联系人选择
         /*
         return success(customerContactsService.selectBySearchKey(searchKey,