改bug

MrShi

4 天以前 1c20c8231980a8d4b91688ff8641a06d3b2f68ab

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncOrgUserFromHKServiceImpl.java

@@ -12,16 +12,17 @@
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.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
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.dao.MemberMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
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 +56,7 @@
     */
    @Override
    @Transactional
    public   void syncOrgData(){
    public   void syncOrgData(LoginUserInfo user){
        if(Constants.DEALING_HK_ORG){
            return ;
        }
@@ -64,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;
@@ -100,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){
@@ -141,7 +141,7 @@
     * @return
     */
    @Override
    public   void syncUserData(){
    public   void syncUserData(LoginUserInfo user){
        if(Constants.DEALING_HK_USER){
            return   ;
        }
@@ -150,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(), "对不起，请先同步企业组织信息~");
@@ -189,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){