Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力

liu

3 天以前 5f612ab2f67b2c6f6894c624a7780799526d566d

 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java

@@ -40,6 +40,8 @@

import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
@@ -133,7 +135,9 @@
    @GetMapping("/page-by-customer")
    @Operation(summary = "获得联系人分页，基于指定客户")
    public CommonResult<PageResult<CrmContactRespVO>> getContactPageByCustomer(@Valid CrmContactPageReqVO pageVO) {
        Assert.notNull(pageVO.getCustomerId(), "客户编号不能为空");
        if (pageVO.getCustomerId() == null) {
            throw exception0(BAD_REQUEST.getCode(), "客户编号不能为空");
        }
        PageResult<CrmContactDO> pageResult = contactService.getContactPageByCustomerId(pageVO);
        return success(new PageResult<>(buildContactDetailList(pageResult.getList()), pageResult.getTotal()));
    }
@@ -141,7 +145,9 @@
    @GetMapping("/page-by-business")
    @Operation(summary = "获得联系人分页，基于指定商机")
    public CommonResult<PageResult<CrmContactRespVO>> getContactPageByBusiness(@Valid CrmContactPageReqVO pageVO) {
        Assert.notNull(pageVO.getBusinessId(), "商机编号不能为空");
        if (pageVO.getBusinessId() == null) {
            throw exception0(BAD_REQUEST.getCode(), "商机编号不能为空");
        }
        PageResult<CrmContactDO> pageResult = contactService.getContactPageByBusinessId(pageVO);
        return success(new PageResult<>(buildContactDetailList(pageResult.getList()), pageResult.getTotal()));
    }