From 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 18 九月 2024 15:19:55 +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/ferp/HkSyncOrgUserToHKServiceImpl.java | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java index 7765f13..eb378b4 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java @@ -11,6 +11,7 @@ import com.doumee.core.haikang.model.param.request.*; import com.doumee.core.haikang.model.param.respose.*; import com.doumee.core.haikang.service.HKService; +import com.doumee.core.model.LoginUserInfo; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DESUtil; import com.doumee.core.utils.DateUtil; @@ -71,8 +72,10 @@ * 鍚屾娴峰悍缁勭粐淇℃伅,鏍规嵁erp鍚屾缁勭粐缁撴灉锛屽畾鏃舵鏌ラ渶瑕佷笅鍙戝埌娴峰悍鐨勭粍缁囦俊鎭� */ @Override - public void syncOrgData(){ - if(Constants.DEALING_HK_ORG || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){ + public void syncOrgData(LoginUserInfo user){ + if(Constants.DEALING_HK_ORG || + !(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp + || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self)){ return ; } Constants.DEALING_HK_ORG =true; @@ -261,8 +264,10 @@ * @return */ @Override - public void syncUserData(){ - if(Constants.DEALING_HK_USER || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){ + public void syncUserData(LoginUserInfo user){ + if(Constants.DEALING_HK_USER || + !(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp + || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self)){ return ; } Constants.DEALING_HK_USER =true; @@ -477,7 +482,7 @@ } if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)){ -// && Constants.equalsObject(member.getHkStatus(),Constants.ONE)){ +// && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){ List<Integer> deviceIds =new ArrayList<>();//鏂拌澶囩紪鐮侀泦鍚� List<Empower> list = new ArrayList<>();//鏂版巿鏉冭褰曢泦鍚� //濡傛灉鐢ㄦ埛鏄悓姝ユ捣搴锋垚鍔燂紝娣诲姞甯︿笅鍙戞潈闄愶紙鍙鐞嗘柊澧炴垨鑰呯紪杈戠殑锛� @@ -518,7 +523,7 @@ .eq(Empower::getMemberId,member.getId()) .eq(Empower::getIsdeleted,Constants.ZERO) .in(Empower::getDeviceId,deviceIds) ); - empowerMapper.insertBatchSomeColumn(list); + empowerMapper.insert(list); } } } @@ -544,7 +549,7 @@ List<Integer> deviceIds =new ArrayList<>();//鏂拌澶囩紪鐮侀泦鍚� List<Empower> list = new ArrayList<>();//鏂版巿鏉冭褰曢泦鍚� if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO) - && Constants.equalsObject(member.getHkStatus(),Constants.ONE)){ + && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){ //濡傛灉鐢ㄦ埛鏄悓姝ユ捣搴锋垚鍔燂紝娣诲姞甯︿笅鍙戞潈闄愶紙鍙鐞嗘柊澧炴垨鑰呯紪杈戠殑锛� List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,addDoorIds)); if(deviceList == null || deviceList.size() == 0){ @@ -577,7 +582,7 @@ .eq(Empower::getMemberId,member.getId()) .eq(Empower::getIsdeleted,Constants.ZERO) .in(Empower::getDeviceId,deviceIds) ); - empowerMapper.insertBatchSomeColumn(list); + empowerMapper.insert(list); } } -- Gitblit v1.9.3