Merge remote-tracking branch 'origin/master'

jiangping

2024-07-22 b7fd27a4a7ac72eef5fc142cae9bb63fe69ef233

 server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java

@@ -12,6 +12,7 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.UsersMapper;
import com.doumee.dao.business.model.Users;
import com.doumee.dao.web.response.ZTBaseInfoResponse;
import com.doumee.service.business.GetCrmDataService;
import com.doumee.service.business.GetZhongTaiDataService;
@@ -45,16 +46,18 @@
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;


    @Override
    public CRMBaseResponse<List<CRMCustomerListResponse>> getCrmCustomerList(CrmCustomerListRequest crmCustomerListRequest){
        if(Objects.isNull(crmCustomerListRequest)
         || Objects.isNull(crmCustomerListRequest.getPage())
         || Objects.isNull(crmCustomerListRequest.getPageSize())
         || StringUtils.isBlank(crmCustomerListRequest.getFlag())
        || Objects.isNull(crmCustomerListRequest.getUserId())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Users users = usersMapper.selectById(crmCustomerListRequest.getUserId());
        crmCustomerListRequest.setUserName(users.getIamUsername());
        CRMBaseResponse<List<CRMCustomerListResponse>> crmBaseResponse = zbomCRMService.getCustomerList(crmCustomerListRequest);
        if(Objects.isNull(crmBaseResponse)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"CRM接口请求失败!");