最新版本541200007

jiangping

2025-06-10 c0f8a98d336602143bf64d7a98828461658b3956

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

@@ -565,7 +565,7 @@
        insert.setParentId(member.getParentId());
        memberMapper.insert(insert);

    /*    TrainTime trainTime = new TrainTime();
    /*  TrainTime trainTime = new TrainTime();
        trainTime.setCreator(loginUserInfo.getId().toString());
        trainTime.setCreateDate(new Date());
        trainTime.setEdirot(loginUserInfo.getId().toString());
@@ -579,7 +579,6 @@
        trainTimeMapper.insert(trainTime);*/
        return insert.getId();
    }

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
@@ -603,6 +602,7 @@
                .set(SystemUser::getUpdateUser,member.getEditor())
                .set(SystemUser::getUpdateTime,member.getEditDate())
        );
//        cancelAllMemberEmpower(member,memberRoleMapper,empowerMapper);
        saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
        List<Cars> carsList = carsMapper.selectList(new QueryWrapper<Cars>().lambda()
                .eq(Cars::getMemberId,member.getId())
@@ -615,6 +615,7 @@
                   carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
                           .eq(Cars::getId,car.getId())
                           .set(Cars::getStartTime,null)
//                           .set(Cars::getMemberId,null)
                           .set(Cars::getEndTime,null)
                           .set(Cars::getAuthTimeType,null)
                           .set(Cars::getAuthStatus,Constants.ZERO)
@@ -627,8 +628,6 @@
            }
        }
    }


    @Override
    public void roleAuthById(Integer id,LoginUserInfo user) {
        Member member = memberMapper.selectById(id);
@@ -697,7 +696,6 @@
                memberRole.setStartTime(trainTime.getStartTime());
                memberRole.setEndTime(trainTime.getEndTime());
            }

            memberMapper.update(null,new UpdateWrapper<Member>().lambda()
                    .eq(Member::getId,member.getId())
                    .set(Member::getRoleId,member.getRoleId())
@@ -1494,11 +1492,15 @@
                        .like(Member::getPhone,pageWrap.getModel().getKeyword())
                        .or().like(Member::getName,pageWrap.getModel().getKeyword())
                        .or().like(Member::getCode,pageWrap.getModel().getKeyword()))
                .eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Member::getIdcardNo,
                        DESUtil.encrypt(Constants.EDS_PWD, pageWrap.getModel().getIdcardNo())
                )
                .isNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ZERO),Member::getFaceId)
                .isNotNull(pageWrap.getModel().getHasFace()!=null&& Constants.equalsInteger(pageWrap.getModel().getHasFace(),Constants.ONE),Member::getFaceId)
                .eq(Objects.nonNull(pageWrap.getModel().getCanVisit()),Member::getCanVisit,pageWrap.getModel().getCanVisit())
                .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Member::getStatus,pageWrap.getModel().getStatus())
                .eq(Objects.nonNull(pageWrap.getModel().getHkStatus()),Member::getHkStatus,pageWrap.getModel().getHkStatus())
                .eq(Objects.nonNull(pageWrap.getModel().getAuthStatus()),Member::getAuthStatus,pageWrap.getModel().getAuthStatus())
                .eq(Objects.nonNull(pageWrap.getModel().getWorkStatus()),Member::getWorkStatus,pageWrap.getModel().getWorkStatus())
                .eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
@@ -1950,7 +1952,6 @@
        }
    }


    @Override
    public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
        List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
@@ -2196,7 +2197,7 @@
        String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
        if(StringUtils.isNotBlank(model.getIdcardNo())){
            if(findMemberFromListByIdcard(candNo,memberList ) !=null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】已存在，请检查表格内容！");
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】已存在，请确认【访客管理】【内部人员】以及【相关方人员】中无该身份证存在，请检查表格内容！");
            }
        }