会议室问题修改

rk

9 小时以前 14d22678d425c50af0d9bcb1c19cfecf7f4ca61b

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -444,6 +444,12 @@
            SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
            this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
            if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
                smsEmailMapper.delete(new QueryWrapper<SmsEmail>().lambda()
                        .eq(SmsEmail::getObjType,Constants.FIVE.toString())
                        .eq(SmsEmail::getStatus,Constants.TWO)
                        .eq(SmsEmail::getType,Constants.TWO)
                        .eq(SmsEmail::getObjId,bookings.getId())
                );
                WxPlatNotice wxPlatNotice = new WxPlatNotice();
                wxPlatNotice.createBeginWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
                wxPlatNotice.createEndWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
@@ -644,11 +650,11 @@
            s.setSysList(userrelList);
            //会议室管理员
            MPJLambdaWrapper<UserRel> param = new MPJLambdaWrapper<>();
            urquery.selectAll(UserRel.class);
            urquery.eq(UserRel::getObjType, MeetConstants.ZERO);
            urquery.eq(UserRel::getIsdeleted, MeetConstants.ZERO);
            urquery.eq(UserRel::getObjId, s.getRoomId());
            List<UserRel> adminList = userRelJoinMapper.selectJoinList(UserRel.class, urquery);
            param.selectAll(UserRel.class);
            param.eq(UserRel::getObjType, MeetConstants.ZERO);
            param.eq(UserRel::getIsdeleted, MeetConstants.ZERO);
            param.eq(UserRel::getObjId, s.getRoomId());
            List<UserRel> adminList = userRelJoinMapper.selectJoinList(UserRel.class, param);
            s.setAdminList(adminList);

            //查询是否有权限
@@ -674,7 +680,7 @@
        if(Constants.equalsInteger(userInfo.getId(),s.getCreator())  ){
              return 1;
        }
        if(adminList!=null){
        if(adminList!=null && userInfo!=null){
            for(UserRel u : adminList){
                if(Constants.equalsInteger(userInfo.getId(),u.getUserId())  ){
                    return 1;
@@ -1210,8 +1216,20 @@
        if (Objects.isNull(bookings)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "未查询到预约记录");
        }
        if (!bookings.getCreator().equals(businessOverDTO.getUserId())) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "非你的预约记录,无法进行取消");

//        LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        //会议室管理员
        MPJLambdaWrapper<UserRel> param = new MPJLambdaWrapper<>();
        param.selectAll(UserRel.class);
        param.eq(UserRel::getObjType, MeetConstants.ZERO);
        param.eq(UserRel::getIsdeleted, MeetConstants.ZERO);
        param.eq(UserRel::getObjId, bookings.getRoomId());
        List<UserRel> adminList = userRelJoinMapper.selectJoinList(UserRel.class, param);
        Integer hasRole =getHasRoleByParam(bookings,businessOverDTO.getLoginUser(),adminList);

//        if (!bookings.getCreator().equals(businessOverDTO.getUserId())) {
        if (!Constants.equalsInteger(hasRole,Constants.ONE)) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，只有会议室管理员和申请人才能进行该操作哦！");
        }
        if (Objects.nonNull(bookings.getStartTimeReal()) && System.currentTimeMillis() > bookings.getStartTimeReal().getTime()) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "会议已开始,无法进行取消");
@@ -1673,7 +1691,7 @@
                    .selectAs(SystemUser::getMobile,UserRel::getUserPhone)
                    .selectAs(SystemUser::getOpenid,UserRel::getOpenid)
                    .leftJoin(SystemUser.class,SystemUser::getId,UserRel::getUserId)
                    .eq(UserRel::getObjType, MeetConstants.ONE)
//                    .eq(UserRel::getObjType, MeetConstants.ONE)
                    .eq(UserRel::getObjId, bookings.getId())
                    .eq(UserRel::getIsdeleted, MeetConstants.ZERO)
                    .isNotNull(SystemUser::getOpenid)