k94314517
2024-03-17 f187a18930a5d6326b5dc3972fd1395611fc5f17
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -179,6 +179,24 @@
        memberMapper.updateById(member);
    }
    @Override
    public void roleAuthById(Integer id) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member member = memberMapper.selectById(id);
        if(member.getIsdeleted().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"员工信息已删除");
        }
        if(!member.getType().equals(Constants.memberType.internal)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非内部人员无法进行该操作");
        }
        memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
    }
    @Override
    public void delete(Member member) {
        UpdateWrapper<Member> deleteWrapper = new UpdateWrapper<>(member);
@@ -375,12 +393,19 @@
    @Override
    public List<Member> findList(Member member) {
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
        if(null != member.getType()) {
            wrapper.lambda().eq(Member::getType,member.getType());
        }
        wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO);
        return memberMapper.selectList(wrapper);
        return memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
                .selectAll(Member.class)
                .selectAs(Company::getName,Member::getCompanyName)
                .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .eq(Objects.isNull(member.getType()),Member::getType,member.getType())
                .eq(Member::getIsdeleted,Constants.ZERO)
        );
//        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
//        if(null != member.getType()) {
//            wrapper.lambda().eq(Member::getType,member.getType());
//        }
//        wrapper.lambda().eq(Member::getIsdeleted,Constants.ZERO);
//        return memberMapper.selectList(wrapper);
    }
    @Override
@@ -603,7 +628,7 @@
        queryWrapper.selectAll(Member.class);
        queryWrapper.selectAs(Company::getName,Member::getCompanyName);
        queryWrapper.select(" ( select count(1) from member_card mc where mc.member_id = t.id ) as  memberCardCount ");
        queryWrapper.select(" ( select count(1) from member_card mc where mc.isdeleted = 0 and  mc.member_id = t.id ) as  memberCardCount ");
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.in(Objects.nonNull(pageWrap.getModel().getCompanyIds())&&pageWrap.getModel().getCompanyIds().size()>0,
                        Member::getCompanyId,pageWrap.getModel().getCompanyIds())