Commit 17f6bb20 authored by 雍欢's avatar 雍欢

支持 MySQL

parent 44630e92
......@@ -1060,7 +1060,7 @@ public class WorkflowApplicationImpl extends BaseApplication implements Workflow
case INITIATE:
case TRACKING:
sql = this.getHistoryTaskSql();
sb.append(" and te.creator_person_member_id_ like :personId and te.task_def_key_ = :taskDefKey and te.previous_id_ is null");
sb.append(" and te.creator_person_member_id_ like :personId and te.task_def_key_ = :taskDefKey and (te.previous_id_ is null or te.previous_id_ ='')");
if (viewKind == ViewTaskKind.TRACKING) {
sb.append(" and pi.end_time_ is null and te.status_id_ = 'completed' ");
}
......@@ -1209,7 +1209,7 @@ public class WorkflowApplicationImpl extends BaseApplication implements Workflow
}
hasCondition = true;
if (!StringUtil.isBlank(administrativeOrgFullId)) {
sb.append(" ( te.creator_full_id_ like :administrativeOrgFullId and te.task_def_key_ = 'Apply' and te.previous_id_ is null)");
sb.append(" ( te.creator_full_id_ like :administrativeOrgFullId and te.task_def_key_ = 'Apply' and (te.previous_id_ is null or te.previous_id_ =''))");
queryModel.putParam("administrativeOrgFullId", administrativeOrgFullId + "%");
if (isSingleProcInstShowOneTask) {
orgCondition = " and tei.creator_full_id_ like :interalOrgId and i.task_def_key_ = 'Apply'";
......
......@@ -189,7 +189,7 @@
from act_hi_taskinst_extension te
where te.proc_inst_id_ = ?
and te.task_def_key_ = 'Apply'
and te.previous_id_ is null
and (te.previous_id_ is null or te.previous_id_ ='')
order by te.id_ desc
</sql>
<sql name="queryApplicantByBizId">
......@@ -205,7 +205,7 @@
te.applicant_person_member_name_ as applicant_person_member_name
from act_hi_taskinst_extension te
where te.business_key_ = ?
and te.previous_id_ is null
and (te.previous_id_ is null or te.previous_id_ ='')
order by te.id_ desc
</sql>
<sql name="loadRuntimeTaskById">
......@@ -377,7 +377,7 @@
where te.proc_inst_id_ = p.proc_inst_id_
and te.task_def_key_ = 'Apply'
and p.end_time_ is null
and te.previous_id_ is null
and (te.previous_id_ is null or te.previous_id_ ='')
and te.status_id_ = 'completed'
and te.creator_person_member_id_ like :personId
</sql>
......
......@@ -19,7 +19,6 @@
<module>huigou-uasp</module>
<module>huigou-loader</module>
<module>huigou-xt</module>
<module>huigou-demo</module>
</modules>
<properties>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment