跟进列表返回上级跟进记录详情信息

yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customerFollowup/CustomerFollowupController.java

@@ -15,6 +15,8 @@ import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants;
 import cn.iocoder.yudao.module.system.enums.download.DownloadTypeEnum;
 import cn.iocoder.yudao.module.system.enums.permission.DataScopeEnum;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -123,8 +125,8 @@ public class CustomerFollowupController {
         PageResult<CustomerFollowupBackVO> backVOPageResult = CustomerFollowupConvert.INSTANCE.convertPage(pageResult);
         if (CollectionUtil.isNotEmpty(backVOPageResult.getList())){
             for (CustomerFollowupBackVO followupBackVO : backVOPageResult.getList()) {
-                if (Objects.nonNull(followupBackVO.getParentId())){
-                    CustomerFollowupDO followupDO = followupService.getById(followupBackVO.getParentId());
+                if (StringUtils.isNotBlank(followupBackVO.getParentNumber())){
+                    CustomerFollowupDO followupDO = followupService.getOne(new LambdaQueryWrapper<CustomerFollowupDO>().eq(CustomerFollowupDO::getParentNumber, followupBackVO.getParentNumber()).orderByDesc(CustomerFollowupDO::getId).last("limit 1"));
                     if (Objects.nonNull(followupDO)){
                         followupBackVO.setParentVO(CustomerFollowupConvert.INSTANCE.convertParent(followupDO));
                     }
@@ -154,8 +156,8 @@ public class CustomerFollowupController {
         PageResult<CustomerFollowupBackVO> backVOPageResult = CustomerFollowupConvert.INSTANCE.convertPage(pageResult);
         if (CollectionUtil.isNotEmpty(backVOPageResult.getList())){
             for (CustomerFollowupBackVO followupBackVO : backVOPageResult.getList()) {
-                if (Objects.nonNull(followupBackVO.getParentId())){
-                    CustomerFollowupDO followupDO = followupService.getById(followupBackVO.getParentId());
+                if (StringUtils.isNotBlank(followupBackVO.getParentNumber())){
+                    CustomerFollowupDO followupDO = followupService.getOne(new LambdaQueryWrapper<CustomerFollowupDO>().eq(CustomerFollowupDO::getParentNumber, followupBackVO.getParentNumber()).orderByDesc(CustomerFollowupDO::getId).last("limit 1"));
                     if (Objects.nonNull(followupDO)){
                         followupBackVO.setParentVO(CustomerFollowupConvert.INSTANCE.convertParent(followupDO));
                     }