流程优化

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowBean;
 import com.fjhx.flow.core.FlowDelegate;
@@ -424,7 +423,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
         }
 
         // 结束节点
-        if (flowStatusEnum == FlowStatusEnum.PASS) {
+        if (FlowStatusEnum.PASS.equals(flowStatusEnum)) {
             invokeEndMethod(context.getJumpNode(), flowDelegate);
         }
 
@@ -765,12 +764,10 @@ public class FlowProcessServiceImpl implements FlowProcessService {
             case RETURN_TO_PREVIOUS:
 
                 // 查找上次审批节点
-                FlowExampleDetail flowExampleDetail = flowExampleDetailService.getOne(
-                        Wrappers.<FlowExampleDetail>lambdaQuery()
-                                .eq(FlowExampleDetail::getFlowExampleId, flowExample.getId())
-                                .eq(FlowExampleDetail::getFlowDefinitionNodeId, jumpNode.getId())
-                                .orderByDesc(BaseIdPo::getId)
-                                .last("limit 1,1"));
+                FlowExampleDetail flowExampleDetail = flowExampleDetailService.getOne(q -> q
+                        .eq(FlowExampleDetail::getFlowExampleId, flowExample.getId())
+                        .eq(FlowExampleDetail::getFlowDefinitionNodeId, jumpNode.getId())
+                        .orderByDesc(BaseIdPo::getId));
 
                 title = StrUtil.format("您于【{}】提交的【{}】被退回，请及时处理。",
                         DateUtil.formatDateTime(flowExampleDetail.getCreateTime()),