diff --git a/src/main/java/com/sipai/mapper/workflow/WfNodeDefinitionMapper.xml b/src/main/java/com/sipai/mapper/workflow/WfNodeDefinitionMapper.xml
index 9af98cc5..858fb7b9 100644
--- a/src/main/java/com/sipai/mapper/workflow/WfNodeDefinitionMapper.xml
+++ b/src/main/java/com/sipai/mapper/workflow/WfNodeDefinitionMapper.xml
@@ -15,14 +15,14 @@
- insert into [OA_ELM].[dbo].wf_node_definition
+ insert into wf_node_definition
process_def_id,
node_key,
@@ -41,7 +41,7 @@
- update [OA_ELM].[dbo].wf_node_definition
+ update wf_node_definition
process_def_id = #{processDefId,jdbcType=BIGINT},
node_key = #{nodeKey,jdbcType=VARCHAR},
@@ -53,9 +53,9 @@
where id = #{id,jdbcType=BIGINT}
- delete from [OA_ELM].[dbo].wf_node_definition where id = #{id,jdbcType=BIGINT}
+ delete from wf_node_definition where id = #{id,jdbcType=BIGINT}
- delete from [OA_ELM].[dbo].wf_node_definition ${where}
+ delete from wf_node_definition ${where}
diff --git a/src/main/java/com/sipai/mapper/workflow/WfProcessDefinitionMapper.xml b/src/main/java/com/sipai/mapper/workflow/WfProcessDefinitionMapper.xml
index 1c16577d..7aa2bb89 100644
--- a/src/main/java/com/sipai/mapper/workflow/WfProcessDefinitionMapper.xml
+++ b/src/main/java/com/sipai/mapper/workflow/WfProcessDefinitionMapper.xml
@@ -17,14 +17,14 @@
- insert into [OA_ELM].[dbo].wf_process_definition
+ insert into wf_process_definition
process_key,
process_name,
@@ -41,7 +41,7 @@
- update [OA_ELM].[dbo].wf_process_definition
+ update wf_process_definition
process_key = #{processKey,jdbcType=VARCHAR},
process_name = #{processName,jdbcType=NVARCHAR},
@@ -53,9 +53,9 @@
where id = #{id,jdbcType=BIGINT}
- delete from [OA_ELM].[dbo].wf_process_definition where id = #{id,jdbcType=BIGINT}
+ delete from wf_process_definition where id = #{id,jdbcType=BIGINT}
- delete from [OA_ELM].[dbo].wf_process_definition ${where}
+ delete from wf_process_definition ${where}
diff --git a/src/main/java/com/sipai/mapper/workflow/WfProcessInstanceMapper.xml b/src/main/java/com/sipai/mapper/workflow/WfProcessInstanceMapper.xml
index 5feb58db..2a74120b 100644
--- a/src/main/java/com/sipai/mapper/workflow/WfProcessInstanceMapper.xml
+++ b/src/main/java/com/sipai/mapper/workflow/WfProcessInstanceMapper.xml
@@ -17,14 +17,14 @@
- insert into [OA_ELM].[dbo].wf_process_instance
+ insert into wf_process_instance
process_def_id,
process_key,
@@ -43,7 +43,7 @@
- update [OA_ELM].[dbo].wf_process_instance
+ update wf_process_instance
process_def_id = #{processDefId,jdbcType=BIGINT},
process_key = #{processKey,jdbcType=VARCHAR},
@@ -56,9 +56,9 @@
where id = #{id,jdbcType=BIGINT}
- delete from [OA_ELM].[dbo].wf_process_instance where id = #{id,jdbcType=BIGINT}
+ delete from wf_process_instance where id = #{id,jdbcType=BIGINT}
- delete from [OA_ELM].[dbo].wf_process_instance ${where}
+ delete from wf_process_instance ${where}
diff --git a/src/main/java/com/sipai/mapper/workflow/WfTaskMapper.xml b/src/main/java/com/sipai/mapper/workflow/WfTaskMapper.xml
index 52355cb3..026407b0 100644
--- a/src/main/java/com/sipai/mapper/workflow/WfTaskMapper.xml
+++ b/src/main/java/com/sipai/mapper/workflow/WfTaskMapper.xml
@@ -19,14 +19,14 @@
- insert into [OA_ELM].[dbo].wf_task
+ insert into wf_task
process_instance_id,
node_def_id,
@@ -49,7 +49,7 @@
- update [OA_ELM].[dbo].wf_task
+ update wf_task
process_instance_id = #{processInstanceId,jdbcType=BIGINT},
node_def_id = #{nodeDefId,jdbcType=BIGINT},
@@ -64,9 +64,9 @@
where id = #{id,jdbcType=BIGINT}
- delete from [OA_ELM].[dbo].wf_task where id = #{id,jdbcType=BIGINT}
+ delete from wf_task where id = #{id,jdbcType=BIGINT}
- delete from [OA_ELM].[dbo].wf_task ${where}
+ delete from wf_task ${where}
diff --git a/src/main/java/com/sipai/mapper/workflow/WfTransitionMapper.xml b/src/main/java/com/sipai/mapper/workflow/WfTransitionMapper.xml
index a9e932f1..631c73a4 100644
--- a/src/main/java/com/sipai/mapper/workflow/WfTransitionMapper.xml
+++ b/src/main/java/com/sipai/mapper/workflow/WfTransitionMapper.xml
@@ -15,14 +15,14 @@
- insert into [OA_ELM].[dbo].wf_transition
+ insert into wf_transition
process_def_id,
source_node_id,
@@ -41,7 +41,7 @@
- update [OA_ELM].[dbo].wf_transition
+ update wf_transition
process_def_id = #{processDefId,jdbcType=BIGINT},
source_node_id = #{sourceNodeId,jdbcType=BIGINT},
@@ -53,9 +53,9 @@
where id = #{id,jdbcType=BIGINT}
- delete from [OA_ELM].[dbo].wf_transition where id = #{id,jdbcType=BIGINT}
+ delete from wf_transition where id = #{id,jdbcType=BIGINT}
- delete from [OA_ELM].[dbo].wf_transition ${where}
+ delete from wf_transition ${where}
diff --git a/src/main/java/com/sipai/workflow/simple/SimpleWorkflowEngine.java b/src/main/java/com/sipai/workflow/simple/SimpleWorkflowEngine.java
index 0a3b4601..23dcd0d6 100644
--- a/src/main/java/com/sipai/workflow/simple/SimpleWorkflowEngine.java
+++ b/src/main/java/com/sipai/workflow/simple/SimpleWorkflowEngine.java
@@ -284,7 +284,7 @@ public class SimpleWorkflowEngine implements IWorkflowEngine {
WfTask queryTask = new WfTask();
queryTask.setWhere("WHERE status = 'PENDING' AND (assignee = '" + userId
+ "' OR candidate_users LIKE '%" + userId + "%') AND process_instance_id IN "
- + "(SELECT id FROM [OA_ELM].[dbo].wf_process_instance WHERE process_key = '" + modelKey + "' AND status = 'RUNNING')");
+ + "(SELECT id FROM wf_process_instance WHERE process_key = '" + modelKey + "' AND status = 'RUNNING')");
List tasks = wfTaskDao.selectListByWhere(queryTask);
return buildTodoTaskResult(tasks);
}
@@ -303,7 +303,7 @@ public class SimpleWorkflowEngine implements IWorkflowEngine {
WfTask queryTask = new WfTask();
queryTask.setWhere("WHERE status != 'PENDING' AND assignee = '" + assignee
+ "' AND process_instance_id IN "
- + "(SELECT id FROM [OA_ELM].[dbo].wf_process_instance WHERE process_key = '" + modelKey + "')");
+ + "(SELECT id FROM wf_process_instance WHERE process_key = '" + modelKey + "')");
List tasks = wfTaskDao.selectListByWhere(queryTask);
List