From 8f6dfbc2ca4a55a1ce0a4bb62094c4bf5c671b4d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 27 十月 2025 10:57:10 +0800
Subject: [PATCH] 会议室问题修改
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index b48807b..31b9644 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -165,6 +165,12 @@
//鍒涘缓浼氳鍗冲皢鍒版湡涓庝細璁嵆灏嗙粨鏉熺殑閫氱煡
if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ 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.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(), "浼氳宸插紑濮�,鏃犳硶杩涜鍙栨秷");
@@ -1329,9 +1347,11 @@
.orderByAsc(Bookings::getStartTime)
.last(" limit 1 ")
);
- bookings.setStartTimeReal(new Date());
- bookings.setEditDate(new Date());
- bookingsMapper.updateById(bookings);
+ if(Objects.nonNull(bookings)){
+ bookings.setStartTimeReal(new Date());
+ bookings.setEditDate(bookings.getStartTimeReal());
+ bookingsMapper.updateById(bookings);
+ }
}
}
}
@@ -1671,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)
--
Gitblit v1.9.3