From 39739e34af928aae204c55db7974213c9b938c5a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 二月 2024 18:33:14 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
index 9602356..e598615 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
@@ -36,7 +36,7 @@
*/
@Service
@Slf4j
-public class HkSyncOrgUserForHKServiceImpl extends HkSyncBaseServiceImpl {
+public class HkSyncOrgUserFromHKServiceImpl extends HkSyncBaseServiceImpl {
@Autowired
private CompanyMapper companyMapper;
@Autowired
@@ -65,7 +65,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- OrgUserListRequest param = new OrgUserListRequest();
+ TimeRangeListRequest param = new TimeRangeListRequest();
//鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級
boolean hasNext = true;
int curTotal = 0;
@@ -74,12 +74,15 @@
List<Company> allHkList = new ArrayList<>();
while (hasNext){
//鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
- param = new OrgUserListRequest();
+ param = new TimeRangeListRequest();
param.setPageNo(curPage);
param.setPageSize(100);
BaseResponse<BaseListPageResponse<OrgInfoResponse>> response = HKService.orgAllList(param);
if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
+ }
+ if(response.getData() == null || response.getData().getTotal() ==0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈悓姝ュ埌浠讳綍淇℃伅锛�");
}
BaseListPageResponse<OrgInfoResponse> r = response.getData();
curTotal += 100;
@@ -152,7 +155,7 @@
if(companies == null || companies.size() == 0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璇峰厛鍚屾浼佷笟缁勭粐淇℃伅~");
}
- OrgUserListRequest param = new OrgUserListRequest();
+ TimeRangeListRequest param = new TimeRangeListRequest();
//鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級
boolean hasNext = true;
int curTotal = 0;
@@ -160,13 +163,16 @@
List<Member> allHkList = new ArrayList<>();
while (hasNext){
//鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
- param = new OrgUserListRequest();
+ param = new TimeRangeListRequest();
param.setPageNo(curPage);
param.setPageSize(100);
BaseResponse<BaseListPageResponse<UserInfoResponse>> response = HKService.userAllList(param);
if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
}
+ if(response.getData() == null || response.getData().getTotal() ==0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈悓姝ュ埌浠讳綍淇℃伅锛�");
+ }
BaseListPageResponse<UserInfoResponse> r = response.getData();
curTotal += 100;
if(curTotal >= r.getTotal()){
--
Gitblit v1.9.3