整理

nidapeng

2024-03-11 81b2bbdbb92dd70ca28c9d556cd8dc4e9329584f

整理

 admin/src/views/business/internalMember.vue

@@ -39,7 +39,7 @@
        <template v-slot:menu>
            <div style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">企业组织架构</div>
            <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
                <Tree :list="companyTree" :defaultProps="{name: 'name', status: 'status', children: 'childList', id: 'erpId'}" @callback="callback" />
                <Tree :list="companyTree" :defaultProps="{name: 'name', status: 'status', children: 'childList', id: 'id',erpId:'erpId'}" @callback="callback" />
            </div>
        </template>
        <!-- 表格和分页 -->

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java

@@ -963,6 +963,7 @@
    }
    private   List<Integer>  getRoleIdByParam(Integer[] param, Member member) {
        //添加人员角色关联数据
        member.setRoleId(null);
        if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
            memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
        }

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java

@@ -77,7 +77,7 @@
               if(response!=null
                       && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null
                       ){
                if(    response.getData().getList() != null
                if(response.getData().getList() != null
                       && response.getData().getList().size()>0 ){
                   TaskPersonDetailResponse model = response.getData().getList().get(0);
                   if(model != null && StringUtils.equals(model.getPersondownloadResult(),"0")){
@@ -103,6 +103,13 @@
                                   .set(Empower::getRemark,remark )
                                   .set(Empower::getSendInfo,remark )
                                   .set(Empower::getSendStatus,Constants.EmpowerStatus.pass) );
                       }else{
                           empowerMapper.update(null,new UpdateWrapper<Empower>()
                               .lambda()
                               .eq(Empower::getId,c.getId() )
                               .set(Empower::getRemark,"下发失败" )
                               .set(Empower::getSendInfo,"下发失败" )
                               .set(Empower::getSendStatus,Constants.EmpowerStatus.fail) );
                       }
                   }else{
                    empowerMapper.update(null,new UpdateWrapper<Empower>()

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java

@@ -209,7 +209,6 @@
        model.setOrgIndexCode(c.getHkId());
        model.setOrgName(c.getName());
        return  model;

    }

    /**
@@ -269,6 +268,7 @@
                    .eq(Member::getHkStatus,Constants.ZERO)
                    .eq(Member::getStatus,Constants.ZERO)
                    .eq(Member::getType,Constants.memberType.internal)
                    .notExists("select d.id from empower d where d.member_id=t.id and d.send_status in (1,5)")//排除有正在同步下发任务的数据
                    .orderByAsc(Member::getErpDate));
            if(list ==null || list.size()==0){
                return;
@@ -350,6 +350,12 @@
        }
        List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
        if(doorIds==null || doorIds.size() == 0){
            //如果权限清空，则清空人员授权的权限数据
            empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
                    .eq(Empower::getMemberId,member.getId())
                    .set(Empower::getIsdeleted,Constants.ONE)
                    .eq(Empower::getIsdeleted,Constants.ZERO)
                    .set(Empower::getSendStatus,Constants.ZERO));
            return;
        }
        if(StringUtils.isBlank(member.getFaceImg())){