From 61b9111d8410e026d796b8a93bb0a7d2ac579f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 25 Jun 2025 10:44:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-369=20=E6=B7=BB=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BA=BF=E5=92=8C=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/pojo/request/AdminTicketSearchRequest.java | 5 ----- .../repository/service/impl/TicketServiceImpl.java | 4 ---- .../src/main/resources/mapper/TicketMapper.xml | 3 --- 3 files changed, 12 deletions(-) diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java index 18be83e0..166716de 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java @@ -1,6 +1,5 @@ package com.nflg.mobilebroken.common.pojo.request; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.EqualsAndHashCode; @@ -23,10 +22,6 @@ public class AdminTicketSearchRequest extends TicketSearchRequest { //质保状态 private Integer warrantyStatus; - //是否是工单管理者 - @JsonIgnore - private boolean ticketManager; - //收藏夹id private Integer favouritesId; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java index 1c5d7f68..15322945 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java @@ -163,8 +163,6 @@ public class TicketServiceImpl extends ServiceImpl impleme if (Objects.nonNull(request.getEndTime())) { request.setEndTime(request.getEndTime().plusDays(1)); } - List tickerMangagers = adminUserService.getTickerMangagers(); - request.setTicketManager(tickerMangagers.stream().anyMatch(uid -> Objects.equals(uid, userId))); if (request.getType() == 2) { return baseMapper.searchFromAdminAndFollow(request, userId,productionLines, new Page<>(request.getPage(), request.getPageSize())); } else if (request.getType() == 4) { @@ -275,8 +273,6 @@ public class TicketServiceImpl extends ServiceImpl impleme return baseMapper.searchAllFromAdminAndFollow(request, AdminUserUtil.getUserId(),productionLines); } else if (request.getType() == 4) { Integer userId=AdminUserUtil.getUserId(); - List tickerMangagers=adminUserService.getTickerMangagers(); - request.setTicketManager(tickerMangagers.stream().anyMatch(uid -> Objects.equals(uid, userId))); return baseMapper.searchAllFromAdmin(request, userId,productionLines); } return Collections.emptyList(); diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml index 4ba23ab1..ad2757e8 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml @@ -44,9 +44,6 @@ #{plId} - - AND (FIND_IN_SET(#{userId},t.handle)>0 OR fun_inAduit(t.id,#{userId})=1) - AND t.state=#{request.state}