Merge remote-tracking branch 'origin/master'

jiangping

2024-01-09 42ef653f816915dcdcc009d5717cf65135ac1fd8

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

@@ -627,10 +627,10 @@
            queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
            queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
            queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
            queryWrapper.selectAs(DeviceEvent::getCreateDate,DoorEventListResponse::getCreateTime);
            queryWrapper.selectAs(DeviceEvent::getHappenTime,DoorEventListResponse::getCreateTime);
            queryWrapper.selectAs(Member::getPhone,DoorEventListResponse::getPhone);
            queryWrapper.selectAs(Member::getErpId,DoorEventListResponse::getUserId);
            queryWrapper.selectAs(Member::getCompanyId,DoorEventListResponse::getOrgId);
            queryWrapper.selectAs(Member::getErpOrgId,DoorEventListResponse::getOrgId);
            queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo);

            if(!Objects.isNull(doorEventListRequest)){
@@ -808,7 +808,7 @@
                    ||Objects.isNull(param.getIdType())//证件类型
                    ||Objects.isNull(param.getSex())//性别
                    ||Objects.isNull(param.getOrgId())//所属组织编码
                    ||StringUtils.isBlank(param.getFaceImg())//人脸照片
//                    ||StringUtils.isBlank(param.getFaceImg())//人脸照片
                    ||StringUtils.isBlank(param.getCode())//工号
                    ||StringUtils.isBlank(param.getPhone())//手机号
             ){
@@ -857,6 +857,8 @@
                member.setStartTime(param.getValidStartTime());
                member.setEndTime(param.getValidEndTime());
                memberMapper.updateById(member);
                //删除用户卡片数据  人员角色关联
//                memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
            }
            //添加人员卡片数据
            getRoleIdByParam(param.getRoleIds(),member);
@@ -900,7 +902,7 @@
                    memberCard.setStatus(Constants.ONE);
                    memberCard.setMemberId(member.getId());
                    memberCard.setIsdeleted(Constants.ZERO);
                    memberCard.setCardType(HKConstants.CARD_TYPE.NORMAL.getKey());
                    memberCard.setType(HKConstants.CARD_TYPE.NORMAL.getKey());
                    memberCard.setHkStatus(Constants.ZERO);
                    memberCard.setRemark("待同步安防平台");
                    memberCard.setType(Constants.TWO);