Merge branch 'master_0929' into master_after20

@@ -106,6 +106,12 @@ public class GetSpecLockDelayApplicationBo extends BaseBo<SpecLockDelayApplicati
     @ApiModelProperty(value = "数量（t）")
     @ApiModelProperty(value = "数量（t）")
     private BigDecimal totalQuantity;
     private BigDecimal totalQuantity;
 
 
+    /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @ApiModelProperty(value = "是否展示审核按钮")
+    private Boolean showExamine;
+
     public GetSpecLockDelayApplicationBo() {
     public GetSpecLockDelayApplicationBo() {
 
 
     }
     }

@@ -108,11 +108,20 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         return getBaseMapper().query(vo);
         return getBaseMapper().query(vo);
     }
     }
 
 
-    @Cacheable(value = SpecLockDelayApplication.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
     @Override
     @Override
     public SpecLockDelayApplication findById(String id) {
     public SpecLockDelayApplication findById(String id) {
+        SpecLockDelayApplication specLockDelayApplication = getBaseMapper().selectById(id);
+        if (specLockDelayApplication == null) {
+            return null;
+        }
+        // 获取当前人员的待办任务数据
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+        if (CollectionUtils.isNotEmpty(flowTaskList)) {
+            List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            specLockDelayApplication.setShowExamine(businessIds.contains(specLockDelayApplication.getId()));
+        }
 
 
-        return getBaseMapper().selectById(id);
+        return specLockDelayApplication;
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "新增锁价无规格操作申请单，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "新增锁价无规格操作申请单，ID：{}", params = {"#id"})