From a1647a5152e3d368ec2fb738ca7cc858e220d06c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 九月 2024 09:15:08 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
index df05a04..21bfeff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java
@@ -56,7 +56,7 @@
*/
@Override
@Transactional
- public void syncOrgData(){
+ public void syncOrgData(LoginUserInfo user){
if(Constants.DEALING_HK_ORG){
return ;
}
@@ -65,7 +65,6 @@
if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.hk){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵");
}
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
TimeRangeListRequest param = new TimeRangeListRequest();
//鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級
boolean hasNext = true;
@@ -101,7 +100,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈悓姝ュ埌浠讳綍缁勭粐淇℃伅锛�");
}
companyMapper.delete(new UpdateWrapper<>());//娓呯┖鍘熸湁鏁版嵁
- companyMapper.insertBatchSomeColumn(allHkList);//鎻掑叆鏂版暟鎹�
+ companyMapper.insert(allHkList);//鎻掑叆鏂版暟鎹�
}catch (BusinessException e){
throw e;
}catch (Exception e){
@@ -142,7 +141,7 @@
* @return
*/
@Override
- public void syncUserData(){
+ public void syncUserData(LoginUserInfo user){
if(Constants.DEALING_HK_USER){
return ;
}
@@ -151,7 +150,6 @@
if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.hk){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵");
}
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
List<Company> companies = companyMapper.selectList(new QueryWrapper<>());
if(companies == null || companies.size() == 0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璇峰厛鍚屾浼佷笟缁勭粐淇℃伅~");
@@ -190,7 +188,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈悓姝ュ埌浠讳綍缁勭粐淇℃伅锛�");
}
memberMapper.delete(new UpdateWrapper<>());//娓呯┖鍘熸湁鏁版嵁
- memberMapper.insertBatchSomeColumn(allHkList);//鎻掑叆鏂版暟鎹�
+ memberMapper.insert(allHkList);//鎻掑叆鏂版暟鎹�
}catch (BusinessException e){
throw e;
}catch (Exception e){
--
Gitblit v1.9.3