修改简道云人员推送删除功能bug

doum

2 天以前 6730b47bed29024618166dc2802277dcd351587c

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -182,11 +182,11 @@
        Member insert = initAddMemberModel(member,loginUserInfo);
        //海康人员新增业务
        try {
             if(dealHkUserBiz(insert)){
            if(dealHkUserBiz(insert)){
                insert.setHkStatus(Constants.ONE);
                memberMapper.insert(insert);
                //创建系统登陆账号（默认无任何角色）
    //                if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
                //                if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
                //如果是内部组织人员，新增系统登陆账号
                systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
                //处理培训有效期业务
@@ -445,7 +445,6 @@
        if(model ==null ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该员工信息不存在，请刷新页面重试！");
        }
        member.setSex(model.getSex());//默认是原来的性别
        if (StringUtils.isNotBlank(member.getPhone())  ){
            if ( !PhoneUtil.isPhone(member.getPhone())) {
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "电话号码格式有误");
@@ -977,7 +976,8 @@
                    .set(Member::getStartTime,null)
                    .set(Member::getEndTime,null)
                    .set(Member::getRoleId,null)
                    .set(StringUtils.isNotBlank(updateMember.getPhone()),Member::getPhone,updateMember.getPhone())
                    .set(StringUtils.isNotBlank(updateMember.getErpId()),Member::getErpId,updateMember.getErpId())
                    .set(StringUtils.isNotBlank(updateMember.getDdId()),Member::getDdId,updateMember.getDdId())
                    .set(StringUtils.isNotBlank(updateMember.getName()),Member::getName,updateMember.getName())
                    .set(Member::getEditDate,updateMember.getEditDate())
                    .set(Member::getEditor,updateMember.getEditor())
@@ -995,7 +995,7 @@
                    .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
                    .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
                    .set(Member::getCode,updateMember.getCode())
    //                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
                    //                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
                    .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
                    .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
                    .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
@@ -2479,44 +2479,60 @@
     */
    @Override
    public void dealJdyMemberInfo(MemberPushData data){
        if(StringUtils.isBlank(data.getUsername())
        if(data.getDeleter()!=null){
            //如果是已经删除人员，不处理 //内部人员信息
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                    .eq( Member::getErpId,data.get_id() )
                    .eq( Member::getIsdeleted,Constants.ZERO )
                    .eq( Member::getType,Constants.TWO )
                    .last("limit 1"));
            if(member == null){
                //如果是已经删除人员，不处理
                return;
            }
            //如果是已经删除人员,删除服务中心人员
            this.deleteById(member.getId(),null);
            return;
        }

        if(StringUtils.isBlank(data.get_id())
                ||StringUtils.isBlank(data.getUsername())
                ||StringUtils.isBlank(data.getPhone())
                ||StringUtils.isBlank(data.getName())){
            throw  new BusinessException(ResponseStatus.JDY_BAD_REQUEST.getCode(),"人员信息不完整！");
        }
        //内部人员信息
        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                .eq( Member::getErpId,data.getUsername() )
                .eq( Member::getErpId,data.get_id() )
                .eq( Member::getIsdeleted,Constants.ZERO )
                .eq( Member::getType,Constants.TWO )
                .last("limit 1"));
        if(member ==null){
            //如果erpid未绑定，按手机号查询用户
              member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
            member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
                    .eq( Member::getPhone,data.getPhone() )
                    .eq( Member::getIsdeleted,Constants.ZERO )
                    .eq( Member::getType,Constants.TWO )
                    .last("limit 1"));
        }
        boolean addOrEdit = false;
        if(member == null){
            //新增人员
            if(data.getDeleter()!=null){
                //如果是已经删除人员，不处理
                return;
            }
            member = getAddOrUpdateModelFromJDY(data,true);
            this.create(member);
            addOrEdit=true;
        }else{
            //更新人员
            if(data.getDeleter()!=null){
                //如果是已经删除人员，不处理
                this.deleteById(member.getId(),null);
            }else{
                //更新人员信息
                Member updateMember =getAddOrUpdateModelFromJDY(data,false);
                updateMember.setId(member.getId());
                this.updateById(updateMember);
            }
            //更新人员信息
            Member updateMember =getAddOrUpdateModelFromJDY(data,false);
            updateMember.setId(member.getId());
            addOrEdit=true;
            this.updateById(updateMember);
        }
        if(addOrEdit && Constants.equalsInteger(member.getHeadStatus(),Constants.ONE) && member.getCompanyModel()!=null){
            //如果是部门主管
            Company updateCom = new Company();
            updateCom.setHeadId(member.getId());
            updateCom.setId(member.getCompanyModel().getId());
            companyMapper.updateById(updateCom);//更新部门主管人员
        }
    }

@@ -2536,7 +2552,11 @@
        if(StringUtils.isNotBlank(data.getCan_visit())){
            member.setCanVisit(StringUtils.equals(data.getCan_visit(),"可拜访")?1:0);
        }
        member.setErpId(data.getUsername());
        if(StringUtils.isNotBlank(data.getMaster())){
            member.setHeadStatus(StringUtils.equals(data.getMaster(),"是")?1:0);
        }
        member.setErpId(data.get_id());
        member.setDdId(data.getUsername());
        if(data.getDepartment()!=null){
            member.setErpOrgId(data.getDepartment().getDept_no());
        }
@@ -2577,7 +2597,7 @@

    private String getMemberImgByJdyImg(String imgurl) {
        try {
            String folder =   systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            String folder = systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            FtpUtil ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
                    Integer.parseInt(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode()),
                    systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode(),
@@ -2601,15 +2621,16 @@
                    selectAll(SystemUser.class )
                    .leftJoin(Member.class,Member::getId,SystemUser::getMemberId)
                    .eq(SystemUser::getDeleted,Boolean.FALSE)
                    .eq(Member::getErpId,user.getUsername())
                    .eq(Member::getDdId,user.getUsername())
                    .last("limit 1"));
        }
       return null;
        return null;
    }

    @Override
    public String syncJdyUserInfo() {
        DeptApiClient deptApiClient = new DeptApiClient(systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.API_KEY).getCode(), HttpConstant.HOST);
        DeptApiClient deptApiClient = new DeptApiClient(systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.JDY_API_KEY).getCode()
                ,systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.JDY_API_HOST).getCode());
        try {
            Map<String, Object> result =  deptApiClient.deptMemberList(1,true,deptApiClient.getDefaultVersion());
            if(result!=null && result.get("users")!=null ){