Compare commits
2 Commits
5ebcdf30e6
...
75bdb66ab2
| Author | SHA1 | Date |
|---|---|---|
|
|
75bdb66ab2 | |
|
|
2bd98a83c1 |
|
|
@ -422,9 +422,9 @@ public class TicketController extends ControllerBase {
|
||||||
|
|
||||||
Ticket ticket = ticketService.getById(request.getTicketId());
|
Ticket ticket = ticketService.getById(request.getTicketId());
|
||||||
List<Integer> handleIds = StrUtil.split(ticket.getHandle(), ",").stream().map(Integer::parseInt).collect(Collectors.toList());
|
List<Integer> handleIds = StrUtil.split(ticket.getHandle(), ",").stream().map(Integer::parseInt).collect(Collectors.toList());
|
||||||
VUtils.trueThrowBusinessError(handleIds.stream().anyMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))
|
// VUtils.trueThrowBusinessError(handleIds.stream().anyMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))
|
||||||
&& request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())))
|
// && request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())))
|
||||||
.throwMessage("不可以移除自己");
|
// .throwMessage("不可以移除自己");
|
||||||
Ticket ticket1 = ticketService.addTicketHandle(request);
|
Ticket ticket1 = ticketService.addTicketHandle(request);
|
||||||
request.getUserIds().removeAll(handleIds);
|
request.getUserIds().removeAll(handleIds);
|
||||||
if (CollectionUtil.isNotEmpty(request.getUserIds())) {
|
if (CollectionUtil.isNotEmpty(request.getUserIds())) {
|
||||||
|
|
|
||||||
|
|
@ -401,9 +401,9 @@ public class TicketController extends ControllerBase {
|
||||||
public ApiResult<Void> addTicketHandle(@Valid @RequestBody TicketHandleAddRequest request) {
|
public ApiResult<Void> addTicketHandle(@Valid @RequestBody TicketHandleAddRequest request) {
|
||||||
GongfuTicket ticket = ticketService.getById(request.getTicketId());
|
GongfuTicket ticket = ticketService.getById(request.getTicketId());
|
||||||
List<Integer> handleIds = StrUtil.split(ticket.getHandle(), ",").stream().map(Integer::parseInt).collect(Collectors.toList());
|
List<Integer> handleIds = StrUtil.split(ticket.getHandle(), ",").stream().map(Integer::parseInt).collect(Collectors.toList());
|
||||||
VUtils.trueThrowBusinessError(handleIds.stream().anyMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))
|
// VUtils.trueThrowBusinessError(handleIds.stream().anyMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))
|
||||||
&& request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())))
|
// && request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())))
|
||||||
.throwMessage("不可以移除自己");
|
// .throwMessage("不可以移除自己");
|
||||||
GongfuTicket ticket1 = ticketService.addTicketHandle(request);
|
GongfuTicket ticket1 = ticketService.addTicketHandle(request);
|
||||||
request.getUserIds().removeAll(handleIds);
|
request.getUserIds().removeAll(handleIds);
|
||||||
if (CollectionUtil.isNotEmpty(request.getUserIds())) {
|
if (CollectionUtil.isNotEmpty(request.getUserIds())) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue