liukangdong
2024-06-12 e9717d6ebed478c4ff7ddbf539d1a591bbf5185a
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -596,7 +596,7 @@
                //如果员工信息不合法直接跳过
               continue;
            }
            if(StringUtils.isNotBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
            if(StringUtils.isBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,用户【"+member.getName()+"】的人脸信息不满足授权条件,请返回完善后再进行该操作!");
            }
            member.setStartTime(memberRole.getStartTime());
@@ -1098,11 +1098,11 @@
        }
        queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
        List<Member> list =  memberJoinMapper.selectJoinList(Member.class,queryWrapper);
        if(list!=null){
            for(Member m : list){
                m.setName(StringUtils.defaultString(m.getName(),"")+"-"+StringUtils.defaultString(m.getCompanyName(),""));
            }
        }
//        if(list!=null){
//            for(Member m : list){
//                m.setName(StringUtils.defaultString(m.getName(),"")+"-"+StringUtils.defaultString(m.getCompanyName(),""));
//            }
//        }
        return  list;
    }
    @Override
@@ -1112,7 +1112,7 @@
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,Member::getCompanyName)
                .eq(Member::getType,Constants.TWO)
                .exists("select d.id from car_driver b where b.isdeleted=0 and b.member_id=t.id");
                .exists("select b.id from car_driver b where b.isdeleted=0 and b.member_id=t.id");
        if(null != member.getType()) {
            queryWrapper.eq(Member::getType,member.getType());