Merge branch 'feature/bug-528' into test
This commit is contained in:
commit
280046ab4c
|
|
@ -539,7 +539,7 @@ public class TicketController extends ControllerBase {
|
||||||
VUtils.trueThrowBusinessError(!Objects.equals(ticket.getState(), TicketState.Processing.getState()))
|
VUtils.trueThrowBusinessError(!Objects.equals(ticket.getState(), TicketState.Processing.getState()))
|
||||||
.throwMessage("当前工单状态不允许通话");
|
.throwMessage("当前工单状态不允许通话");
|
||||||
VUtils.trueThrowBusinessError(!StrUtil.equals(ticket.getUserPlatform(), AppUserUtil.getFrom())
|
VUtils.trueThrowBusinessError(!StrUtil.equals(ticket.getUserPlatform(), AppUserUtil.getFrom())
|
||||||
|| Objects.equals(AppUserUtil.getUserId(), ticket.getUserId()))
|
|| !Objects.equals(AppUserUtil.getUserId(), ticket.getUserId()))
|
||||||
.throwMessage("不是创建人无法加入通话");
|
.throwMessage("不是创建人无法加入通话");
|
||||||
VUtils.trueThrowBusinessError(ticketCallService.isInCall(AppUserUtil.getUserId()))
|
VUtils.trueThrowBusinessError(ticketCallService.isInCall(AppUserUtil.getUserId()))
|
||||||
.throwMessage("您已加入别的通话中");
|
.throwMessage("您已加入别的通话中");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue