@@ -348,9 +348,6 @@
<if test="userId != null">
AND cgsm.user_id_ = #{userId}
</if>
- <if test="tenantId != null">
- AND cgsm.tenant_id_ = #{tenantId}
- </if>
<if test="search != null and search != ''">
AND (cg.name_ LIKE CONCAT('%',#{search},'%') OR cg.group_name_ LIKE CONCAT('%',#{search},'%') OR mg.name_ LIKE CONCAT('%',#{search},'%'))
@@ -493,7 +493,7 @@ public class RoomServiceImpl implements RoomService {
}
String leaveSuccessKey = "leaveRoomSuccess" + roomId + userId;
- Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey, roomId, 10l, TimeUnit.SECONDS);
+ Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey, roomId, 1l, TimeUnit.SECONDS);
log.info("leaveRoomSuccess: roomId={}, userId={},deviceNum={},aBoolean={}", roomId, userId, deviceNum, aBoolean);
if (!aBoolean) {
if (StringUtils.isNotEmpty(deviceNum)) {