From 9a8d9ef43c70fe6d70b494f49b19e5ca6ef01d4b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 14 三月 2025 17:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
index 46ca3a5..5b0cd76 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.flowable.apithird.business.mapper.FlowMyBusinessMapper">
-
- <select id="findPageList" resultType="org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto">
+ <select id="getPageList" resultType="org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto">
SELECT
- flow_my_business.*,
- ACT_HI_PROCINST.START_TIME_ as start_time,
- ACT_HI_PROCINST.END_TIME_ as end_time,
- NC_ASSIGN_FILE_STREAM.STATUS as status,
- ACT_RE_PROCDEF.NAME_ as flowName
+ flow_my_business.*,
+ ACT_HI_PROCINST.START_TIME_ as start_time,
+ ACT_HI_PROCINST.END_TIME_ as end_time,
+ NC_ASSIGN_FILE_STREAM.STATUS as status,
+ ACT_RE_PROCDEF.NAME_ as flowName
FROM
flow_my_business
LEFT JOIN ACT_HI_PROCINST ON flow_my_business.process_instance_id = ACT_HI_PROCINST.ID_
--
Gitblit v1.9.3