更改头部

doum

4 天以前 e3552c670fe7f2228d3d427e6bf3b4ab400ce8e2

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

@@ -182,7 +182,8 @@
        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)){
@@ -191,9 +192,9 @@
            //处理培训有效期业务
            dealTrainTIme(member,0,loginUserInfo);
//                }
//            }else{
//                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
//            }
            }else{
                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
            }
        }catch (BusinessException e){
            //如果发生异常，删除已经创建的人员信息
            deleteHkUserBiz(new String[]{insert.getHkId()});
@@ -257,7 +258,7 @@
        insert.setCanVisit(Constants.formatIntegerNum(member.getCanVisit()));//默认不可访问
        insert.setAuthStatus(Constants.ZERO);
        insert.setName(member.getName());
        insert.setHkId(UUID.randomUUID().toString().replace("-",""));
//        insert.setHkId(UUID.randomUUID().toString().replace("-",""));
        insert.setHkStatus(Constants.ZERO);
        insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//根据身份证号获取性别
        insert.setJobDate(member.getJobDate());
@@ -401,7 +402,7 @@
                .eq(Member::getIsdeleted,Constants.ZERO) ) >0){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "手机号【"+member.getPhone()+"】已被使用，不能重复");
        }
        Company company = member.getCompany()!=null ?member.getCompany(): companyMapper.selectById(member.getCompanyId());
        Company company = member.getCompanyModel()!=null ?member.getCompanyModel(): companyMapper.selectById(member.getCompanyId());
        if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息已被删除！");
        }
@@ -505,7 +506,7 @@
        }
        if(member.getCompanyId()!=null && !Constants.equalsInteger(member.getCompanyId(),model.getCompanyId())){
            //如果组织发生变化
            Company company = member.getCompany()!=null ?member.getCompany(): companyMapper.selectById(member.getCompanyId());
            Company company = member.getCompanyModel()!=null ?member.getCompanyModel(): companyMapper.selectById(member.getCompanyId());
            if(company == null || Constants.equalsInteger(company.getIsdeleted(),Constants.ONE)){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该组织信息已被删除，请刷新页面重试！");
            }
@@ -968,7 +969,8 @@
        updateMember.setEditor(loginUserInfo!=null?loginUserInfo.getId():null);
        updateMember.setEditDate(new Date());
        //海康人员新增业务
//        if(dealHkUserForUpdateBiz(updateMember)){
        if(dealHkUserForUpdateBiz(updateMember)){
            updateMember.setHkStatus(Constants.ONE);
        updateMember.setHkId(null);
        updateMember.setAuthStatus(Constants.ZERO);
        memberMapper.update(null,new UpdateWrapper<Member>().lambda()
@@ -988,7 +990,6 @@
                .set(updateMember.getCanVisit()!=null,Member::getCanVisit,updateMember.getCanVisit())
                .set(updateMember.getFaceStatus()!=null,Member::getFaceStatus,updateMember.getFaceStatus())
                .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
                .set(updateMember.getHkDate()!=null,Member::getHkDate,updateMember.getHkDate())
                .set(StringUtils.isNotBlank(updateMember.getRemark()),Member::getRemark,updateMember.getRemark())
                .set(StringUtils.isNotBlank(updateMember.getFaceImg()),Member::getFaceImg,updateMember.getFaceImg())
                .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
@@ -1003,9 +1004,9 @@
        cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
        //记录操作日志
        saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper,null);
//        }else{
//            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
//        }
        }else{
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
        }
    }

    private void dealTrainTIme(Member updateMember, int i,LoginUserInfo loginUserInfo) {
@@ -2570,7 +2571,7 @@
        if(depart!=null){
            member.setCompanyId(depart.getId());
        }
        member.setCompany(depart);
        member.setCompanyModel(depart);
        return  member;
    }

@@ -2608,7 +2609,7 @@

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