Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvis...

MrShi

3 天以前 3b759ef71bb48f9bb6f8445770d20e8ea7921788

 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);