rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rakor:75bdb66ab2ed8cd86ae4ad15dcbc4f494d5c9ea0
Branches Tags
rakor:master
rakor:test
rakor:feature/quotation
rakor:develop
rakor:prod/20260227
rakor:prod/20260226
rakor:prod/20260214
rakor:feature/quotation-mac
rakor:feature/quotation-zhangke
rakor:prod/20260206
rakor:feature/gongfu
rakor:feature/data-permission
rakor:prod/20260115
rakor:feature/bug-905
rakor:prod/20250902
rakor:master-20250817
rakor:feature/product
rakor:feature/bug-528
rakor:feature/bug-384
rakor:feature/bug-524
rakor:feature/bug-369
rakor:feature/202504-1
rakor:feature/202504
rakor:feature/ticket-add-solution
rakor:DM/基础信息维护
..
compare: rakor:5ebcdf30e642f917ce0df906da5b864444954c30
Branches Tags
rakor:master
rakor:test
rakor:feature/quotation
rakor:develop
rakor:prod/20260227
rakor:prod/20260226
rakor:prod/20260214
rakor:feature/quotation-mac
rakor:feature/quotation-zhangke
rakor:prod/20260206
rakor:feature/gongfu
rakor:feature/data-permission
rakor:prod/20260115
rakor:feature/bug-905
rakor:prod/20250902
rakor:master-20250817
rakor:feature/product
rakor:feature/bug-528
rakor:feature/bug-384
rakor:feature/bug-524
rakor:feature/bug-369
rakor:feature/202504-1
rakor:feature/202504
rakor:feature/ticket-add-solution
rakor:DM/基础信息维护

No commits in common. "75bdb66ab2ed8cd86ae4ad15dcbc4f494d5c9ea0" and "5ebcdf30e642f917ce0df906da5b864444954c30" have entirely different histories.
75bdb66ab2 ... 5ebcdf30e6

2 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

6
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
View File

@ -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())) {

6
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java
View File

@ -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())) {