From 4d68e5e747124913b72fffc9bcc445d65e210a9b Mon Sep 17 00:00:00 2001
From: min <bluesfish@yeah.net>
Date: Tue, 9 Jan 2024 00:19:38 +0800
Subject: [PATCH] =?UTF-8?q?CRM=EF=BC=9A=E3=80=90=E7=BA=BF=E7=B4=A2?=
 =?UTF-8?q?=E3=80=91=E5=88=9B=E5=BB=BA=E7=BA=BF=E7=B4=A2=E6=97=B6=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/clue/vo/CrmClueBaseVO.java    |  7 ++++---
 .../crm/service/clue/CrmClueServiceImpl.java       | 14 ++++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueBaseVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueBaseVO.java
index b7ff0ef3e..1531bb210 100644
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueBaseVO.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueBaseVO.java
@@ -3,11 +3,10 @@ package cn.iocoder.yudao.module.crm.controller.admin.clue.vo;
 import cn.iocoder.yudao.framework.common.validation.Mobile;
 import cn.iocoder.yudao.framework.common.validation.Telephone;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -24,7 +23,6 @@ public class CrmClueBaseVO {
     private String name;
 
     @Schema(description = "客户 id", requiredMode = Schema.RequiredMode.REQUIRED, example = "520")
-    @NotNull(message = "客户不能为空")
     private Long customerId;
 
     @Schema(description = "下次联系时间", example = "2023-10-18 01:00:00")
@@ -46,6 +44,9 @@ public class CrmClueBaseVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime contactLastTime;
 
+    @Schema(description = "负责人编号")
+    private Long ownerUserId;
+
     @Schema(description = "备注", example = "随便")
     private String remark;
 
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
index 141a4d6a2..fdc2168e2 100644
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.CLUE_NOT_EXISTS;
@@ -43,11 +44,14 @@ public class CrmClueServiceImpl implements CrmClueService {
 
     @Override
     public Long createClue(CrmClueCreateReqVO createReqVO) {
-        // 校验客户是否存在
-        customerService.validateCustomer(createReqVO.getCustomerId());
+        // 如果传入客户，校验客户是否存在
+        if (Objects.nonNull(createReqVO.getCustomerId())) {
+            customerService.validateCustomer(createReqVO.getCustomerId());
+        }
         // 插入
         CrmClueDO clue = CrmClueConvert.INSTANCE.convert(createReqVO);
         clueMapper.insert(clue);
+        System.out.println(1);
         // 返回
         return clue.getId();
     }
@@ -57,8 +61,10 @@ public class CrmClueServiceImpl implements CrmClueService {
     public void updateClue(CrmClueUpdateReqVO updateReqVO) {
         // 校验存在
         validateClueExists(updateReqVO.getId());
-        // 校验客户是否存在
-        customerService.validateCustomer(updateReqVO.getCustomerId());
+        // 如果传入客户，校验客户是否存在
+        if (Objects.nonNull(updateReqVO.getCustomerId())) {
+            customerService.validateCustomer(updateReqVO.getCustomerId());
+        }
 
         // 更新
         CrmClueDO updateObj = CrmClueConvert.INSTANCE.convert(updateReqVO);