diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java index 79c7145e..1b41c405 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java @@ -107,13 +107,10 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl list) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); for (ProcessEsInspectPlan processEsInspectPlan : list) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(ProcessEsInspectPlanOpinion::getInspectPlanId, processEsInspectPlan.getId()); - if (StringUtils.isNotBlank(processEsInspectPlan.getNodeId()) && EsInspectPlanCommon.PROCESS_NODE_2.equals(processEsInspectPlan.getNodeId())){ - queryWrapper.eq(ProcessEsInspectPlanOpinion::getCreateBy, loginUser.getUsername()); - } + queryWrapper.orderByDesc(ProcessEsInspectPlanOpinion::getCreateTime); List opinionList = iProcessEsInspectPlanOpinionService.list(queryWrapper); for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : opinionList) { // 用户翻译