From 6e1f28f042cf597b85c0a02b031b9db9b7e55358 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 30 七月 2024 09:11:02 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia --- server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java index 08026cc..fe47fd6 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/GetCrmDataServiceImpl.java @@ -56,8 +56,10 @@ ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } - Users users = usersMapper.selectById(crmCustomerListRequest.getUserId()); - crmCustomerListRequest.setUserName(users.getIamUsername()); + if(StringUtils.isBlank(crmCustomerListRequest.getUserName())){ + 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鎺ュ彛璇锋眰澶辫触!"); -- Gitblit v1.9.3