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