From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 e598615..5e862c1 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
@@ -17,11 +17,11 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -55,7 +55,7 @@
*/
@Override
@Transactional
- public void syncOrgData(){
+ public void syncOrgData(LoginUserInfo user){
if(Constants.DEALING_HK_ORG){
return ;
}
@@ -64,7 +64,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;
@@ -100,7 +99,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){
@@ -141,7 +140,7 @@
* @return
*/
@Override
- public void syncUserData(){
+ public void syncUserData(LoginUserInfo user){
if(Constants.DEALING_HK_USER){
return ;
}
@@ -150,7 +149,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(), "瀵逛笉璧凤紝璇峰厛鍚屾浼佷笟缁勭粐淇℃伅~");
@@ -189,7 +187,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