From 3b759ef71bb48f9bb6f8445770d20e8ea7921788 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 06 一月 2026 13:58:14 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 8fe86fe..2d450cc 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
@@ -129,9 +129,7 @@
*/
@Override
public void syncOrgData(LoginUserInfo user){
- if(Constants.DEALING_HK_ORG ||
- !(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp
- || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self)){
+ if(Constants.DEALING_HK_ORG || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk ){
return ;
}
Constants.DEALING_HK_ORG =true;
@@ -321,9 +319,8 @@
*/
@Override
public void syncUserData(LoginUserInfo user){
- if(Constants.DEALING_HK_USER ||
- !(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp
- || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self)){
+ //浜哄憳鏋勫缓浠ュ畨闃插钩鍙颁负涓伙紝涓嶆墽琛岃鎿嶄綔
+ if(Constants.DEALING_HK_USER || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
return ;
}
Constants.DEALING_HK_USER =true;
@@ -360,8 +357,7 @@
*/
@Override
public void syncMemberDelData(){
- if(Constants.DEALING_HK_DEL_USER
- || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())== DataSyncConfig.origin.hk){
+ if(Constants.DEALING_HK_DEL_USER || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())== DataSyncConfig.origin.hk){
return ;
}
Constants.DEALING_HK_DEL_USER =true;
@@ -767,7 +763,13 @@
}else{
noticeErpFail(c,Constants.ZERO,"浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒");
c.setHkStatus(Constants.TWO);
- c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴鏇存柊澶辫触锛岃淇鍚庨噸璇曪紒锛�"+(result!=null?result.getCode()+result.getMsg():""));
+ String msg =(result!=null?result.getCode()+result.getMsg():"");
+ c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴鏇存柊澶辫触锛岃淇鍚庨噸璇曪紒锛�"+msg);
+ if(StringUtils.contains(msg,"Person Not Exists")){
+ //浜哄憳淇℃伅涓嶅瓨鍦紝娓呯┖hkId锛岄噸鏂版坊鍔�
+ c.setHkId("-");
+ c.setHkStatus(Constants.ZERO);
+ }
}
c.setHkDate(date);
c.setEditDate(date);
--
Gitblit v1.9.3