From 4fa4e8cdf578b93dc45997c2f48878c99cd402ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 3 Apr 2025 11:38:05 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mobilebroken):=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=E4=B8=BA=E6=A0=B9=E6=9C=AC?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=88=86=E6=9E=90=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 TicketInfoVO 中的 solution 字段注释从"解决方案"改为"根本原因分析" - 优化 TicketSolutionServiceImpl 中的权限判断逻辑，增加 SaTokenAdminUtil.isLogin() 判断 --- .../mobilebroken/common/pojo/vo/TicketInfoVO.java | 2 +- .../service/impl/TicketSolutionServiceImpl.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java index f8418d1c..88ab722b 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java @@ -95,7 +95,7 @@ public class TicketInfoVO { //评价 private TicketEvaluateVO evaluate; - //解决方案 + //根本原因分析 private String solution; /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java index 38f4b2dd..958d8d42 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java @@ -11,6 +11,7 @@ import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresDataItemVO; import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresItemVO; import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresVO; import com.nflg.mobilebroken.common.util.AdminUserUtil; +import com.nflg.mobilebroken.common.util.SaTokenAdminUtil; import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.repository.entity.DictionaryItem; import com.nflg.mobilebroken.repository.entity.Ticket; @@ -60,10 +61,12 @@ public class TicketSolutionServiceImpl extends ServiceImpl solutions = lambdaQuery().eq(TicketSolution::getTicketId, ticketId).orderByAsc(TicketSolution::getId).list(); Map> groupedSolutions = solutions.stream().collect(Collectors.groupingBy(TicketSolution::getDictionaryItemName, LinkedHashMap::new, Collectors.toList())); SolutionMeasuresVO vo=new SolutionMeasuresVO(); - TicketSolutionAudit audit =ticketSolutionAuditService.getByTicketAndUser(ticketId,AdminUserUtil.getUserId()); - if (Objects.nonNull(audit)) { - vo.setInAudit(true); - vo.setApproved(Objects.isNull(audit.getState()) ? null : Objects.equals(audit.getState(), 1)); + if (SaTokenAdminUtil.isLogin()) { + TicketSolutionAudit audit = ticketSolutionAuditService.getByTicketAndUser(ticketId, AdminUserUtil.getUserId()); + if (Objects.nonNull(audit)) { + vo.setInAudit(true); + vo.setApproved(Objects.isNull(audit.getState()) ? null : Objects.equals(audit.getState(), 1)); + } } List items = new ArrayList<>(); if (CollectionUtil.isEmpty(groupedSolutions)) {