CRM提交更新

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;
+
 }

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

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;
 
     /**

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;
     /**
      * 跟进类型
      */

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaCustomerServiceImpl.java

@@ -117,7 +117,6 @@ public class OaCustomerServiceImpl implements IOaCustomerService {
     @Override
     public TableDataInfo<OaCustomerVo> queryPageListToUser(OaCustomerBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
-        lqw.eq(OaCustomer::getOwnerUserId, LoginHelper.getUserId());
         Page<OaCustomerVo> result = baseMapper.selectVoPageToUser(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -125,7 +124,6 @@ public class OaCustomerServiceImpl implements IOaCustomerService {
     @Override
     public TableDataInfo<OaCustomerVo> queryPageListToSea(OaCustomerBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
-        lqw.isNull(OaCustomer::getOwnerUserId);
         Page<OaCustomerVo> result = baseMapper.selectVoPageToUser(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }