Commit da8687fb authored by yanghao's avatar yanghao

fix: #826 【客户】合并客户,​被合并客户-非主客户联系人未显示

parent ee367a23
package cn.iocoder.yudao.module.customer.controller.admin.customer; package cn.iocoder.yudao.module.customer.controller.admin.customer;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.boot.module.order.api.OrderApi; import cn.iocoder.boot.module.order.api.OrderApi;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
...@@ -341,7 +342,7 @@ public class CustomerMergeServiceImpl implements CustomerMergeService { ...@@ -341,7 +342,7 @@ public class CustomerMergeServiceImpl implements CustomerMergeService {
try { try {
// 1、联系人copy一份 // 1、联系人copy一份
CustomerContactsDO newCustomer = new CustomerContactsDO(); CustomerContactsDO newCustomer = new CustomerContactsDO();
BeanUtils.copyProperties(newCustomer, d); BeanUtil.copyProperties(d, newCustomer);
newCustomer.setId(null); newCustomer.setId(null);
//被合并的客户联系人,默认为非默认 //被合并的客户联系人,默认为非默认
newCustomer.setIsDefault(0); newCustomer.setIsDefault(0);
......
### 客户跟进
GET {{baseUrl}}/customer/followup/getFollowupNewNumber
Authorization: Bearer {{token}}
tenant-id: {{adminTenentId}}
Content-Type: application/json
### 客户跟进 ### 客户跟进
GET {{baseUrl}}/customer/followup/page?pageNo=1&pageSize=10&total=0&customerId=51966 GET {{baseUrl}}/customer/followup/page?pageNo=1&pageSize=10&total=0&customerId=51966
Authorization: Bearer {{token}} Authorization: Bearer {{token}}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment