rk
2 天以前 e265fd71f866680a23248bf54575083cedb531ed
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -617,23 +617,15 @@
            if(Objects.isNull(jkCabinet)){
                return jkCabinetGridList;
            }
            if(Constants.equalsInteger(jkCabinet.getDoubleAuth(),Constants.ONE)){
                if(StringUtils.isBlank(jkCabinet.getAuthMemberId())){
            if(Constants.equalsInteger(jkCabinet.getDoubleAuth(),Constants.ONE)&&Constants.equalsInteger(dto.getType(),Constants.ZERO)){
                if(StringUtils.isBlank(jkCabinet.getAuthMemberId())||Objects.isNull(dto.getAutoMemberId())){
                    return jkCabinetGridList;
                }
                List<String> authMemberList =  Arrays.asList(jkCabinet.getAuthMemberId().split(","));
                Boolean flag = true;
                for (String id:authMemberList) {
                    if(Arrays.asList(jkCabinet.getAuthMemberId().split(",")).contains(id)){
                        flag = false;
                        break;
                    }
                }
                if(flag){
                if(!authMemberList.contains(dto.getAutoMemberId())){
                    return jkCabinetGridList;
                }
            }
            //如果是还钥匙 则直接查询已借出的钥匙的数据
            if(Constants.equalsInteger(dto.getType(),Constants.ONE)){
                jkCabinetGridList = jkCabinetGridMapper.selectJoinList(JkCabinetGrid.class,
@@ -691,7 +683,11 @@
                                .eq(JkKeys::getRoleType,Constants.ONE)
//                                .eq(Cars::getMemberId,dto.getMemberId())
                                .isNotNull(JkCabinetGrid::getKeyId)
                                .apply(" t2.code in ( select c.car_code from car_use_book c   where c.isdeleted = 0   and NOW() > DATE_SUB(c.START_TIME, INTERVAL "+earlyConfig+" MINUTE) and now() < c.end_time  and c.DRIVER_ID = "+dto.getMemberId()+" ) ")
                                .apply(" ( t2.code in ( select c.car_code from car_use_book c   where c.isdeleted = 0   and NOW() > DATE_SUB(c.START_TIME, INTERVAL "+earlyConfig+" MINUTE) and now() < c.end_time  " +
                                        " and   c.DRIVER_ID = "+dto.getMemberId()+"   )" +
                                        " or t2.code in ( select c.car_code from car_use_book c inner join  cars c1 on c.CAR_ID = c1.ID  where c1.MEMBER_ID = 6611 AND NOW() > DATE_SUB( c.START_TIME, INTERVAL 30 MINUTE ) AND now() < c.end_time )" +
                                        " )" +
                                        " ")
                );
                for (JkCabinetGrid jkCabinetGrid:jkCabinetGridList) {