Compare commits

...

2 Commits

Author SHA1 Message Date
曹鹏飞 75bdb66ab2 Merge branch 'prod/20260213' into develop 2026-02-12 21:18:06 +08:00
曹鹏飞 2bd98a83c1 fix(ticket): 移除工单处理中的自移除限制
- 注释掉管理员移除自己时的业务错误校验逻辑
- 允许管理员从工单处理人员列表中移除自己
- 保留其他工单处理功能的完整性
2026-02-12 21:17:23 +08:00
2 changed files with 6 additions and 6 deletions

View File

@ -422,9 +422,9 @@ public class TicketController extends ControllerBase {
Ticket ticket = ticketService.getById(request.getTicketId());
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()))
&& request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())))
.throwMessage("不可以移除自己");
// VUtils.trueThrowBusinessError(handleIds.stream().anyMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))
// && request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())))
// .throwMessage("不可以移除自己");
Ticket ticket1 = ticketService.addTicketHandle(request);
request.getUserIds().removeAll(handleIds);
if (CollectionUtil.isNotEmpty(request.getUserIds())) {

View File

@ -401,9 +401,9 @@ public class TicketController extends ControllerBase {
public ApiResult<Void> addTicketHandle(@Valid @RequestBody TicketHandleAddRequest request) {
GongfuTicket ticket = ticketService.getById(request.getTicketId());
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()))
&& request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())))
.throwMessage("不可以移除自己");
// VUtils.trueThrowBusinessError(handleIds.stream().anyMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId()))
// && request.getUserIds().stream().noneMatch(uid -> Objects.equals(uid, AdminUserUtil.getUserId())))
// .throwMessage("不可以移除自己");
GongfuTicket ticket1 = ticketService.addTicketHandle(request);
request.getUserIds().removeAll(handleIds);
if (CollectionUtil.isNotEmpty(request.getUserIds())) {