From c0cb31a27522f2b480d7f98784eef37c2fb75f2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 09:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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