DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CRM提交更新

Browse Source
This commit is contained in:
hdka
2025-03-13 10:51:39 +08:00
parent 0ce49d1504
commit 950210d681
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFollowUpRecord.java
View File

@@ -67,4 +67,6 @@ public class OaFollowUpRecord extends BaseEntity {
@TableLogic @TableLogic
private Long delFlag; private Long delFlag;
private Long customerId;
} }

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFollowUpRecordBo.java
View File

@@ -69,6 +69,6 @@ public class OaFollowUpRecordBo extends BaseEntity {
* 关联的联系人编号数组 * 关联的联系人编号数组
*/ */
private String contactIds; private String contactIds;
private Long customerId;
} }

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProductBo.java
View File

@@ -30,13 +30,11 @@ public class OaProductBo extends BaseEntity {
/** /**
* 产品名称 * 产品名称
*/ */
@NotBlank(message = "产品名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String productName; private String productName;
/** /**
* 产品编码 * 产品编码
*/ */
@NotBlank(message = "产品编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String productNumber; private String productNumber;
/** /**

1
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFollowUpRecordVo.java
View File

@@ -29,6 +29,7 @@ public class OaFollowUpRecordVo {
@ExcelProperty(value = "编号") @ExcelProperty(value = "编号")
private Long followId; private Long followId;
private Long customerId;
/** /**
* 跟进类型 * 跟进类型
*/ */

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

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