From 950210d681fb1f0a42daf0a63b5a0e760a739bc2 Mon Sep 17 00:00:00 2001 From: hdka <823267011@qq.com> Date: Thu, 13 Mar 2025 10:51:39 +0800 Subject: [PATCH] =?UTF-8?q?CRM=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/oa/domain/OaFollowUpRecord.java | 2 ++ .../main/java/com/ruoyi/oa/domain/bo/OaFollowUpRecordBo.java | 2 +- ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProductBo.java | 2 -- .../main/java/com/ruoyi/oa/domain/vo/OaFollowUpRecordVo.java | 1 + .../java/com/ruoyi/oa/service/impl/OaCustomerServiceImpl.java | 2 -- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFollowUpRecord.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFollowUpRecord.java index cc4ef8c..dd6a519 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFollowUpRecord.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFollowUpRecord.java @@ -67,4 +67,6 @@ public class OaFollowUpRecord extends BaseEntity { @TableLogic private Long delFlag; + private Long customerId; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFollowUpRecordBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFollowUpRecordBo.java index 4f17a87..3bc8b7c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFollowUpRecordBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFollowUpRecordBo.java @@ -69,6 +69,6 @@ public class OaFollowUpRecordBo extends BaseEntity { * 关联的联系人编号数组 */ private String contactIds; - + private Long customerId; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProductBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProductBo.java index 266aacf..a41d106 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProductBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProductBo.java @@ -30,13 +30,11 @@ public class OaProductBo extends BaseEntity { /** * 产品名称 */ - @NotBlank(message = "产品名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String productName; /** * 产品编码 */ - @NotBlank(message = "产品编码不能为空", groups = { AddGroup.class, EditGroup.class }) private String productNumber; /** diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFollowUpRecordVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFollowUpRecordVo.java index 35dd880..50aa912 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFollowUpRecordVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFollowUpRecordVo.java @@ -29,6 +29,7 @@ public class OaFollowUpRecordVo { @ExcelProperty(value = "编号") private Long followId; + private Long customerId; /** * 跟进类型 */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaCustomerServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaCustomerServiceImpl.java index 6aea575..8c72f48 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaCustomerServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaCustomerServiceImpl.java @@ -117,7 +117,6 @@ public class OaCustomerServiceImpl implements IOaCustomerService { @Override public TableDataInfo queryPageListToUser(OaCustomerBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - lqw.eq(OaCustomer::getOwnerUserId, LoginHelper.getUserId()); Page result = baseMapper.selectVoPageToUser(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -125,7 +124,6 @@ public class OaCustomerServiceImpl implements IOaCustomerService { @Override public TableDataInfo queryPageListToSea(OaCustomerBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - lqw.isNull(OaCustomer::getOwnerUserId); Page result = baseMapper.selectVoPageToUser(pageQuery.build(), lqw); return TableDataInfo.build(result); }