|
@@ -22,6 +22,7 @@ import org.activiti.engine.TaskService;
|
|
|
import org.activiti.engine.task.IdentityLink;
|
|
|
import org.activiti.engine.task.Task;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
@@ -76,6 +77,9 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
|
|
|
@Resource
|
|
|
SysUserService sysUserService;
|
|
|
|
|
|
+ @Value("${db.name}")
|
|
|
+ String databaseName;
|
|
|
+
|
|
|
/**
|
|
|
* 查询动态sop表名是否存在
|
|
|
*
|
|
@@ -131,7 +135,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
|
|
|
int count = this.selectDynamicSop(tableName, tfCustomFlow.getFlowDeploymentId(), flowId);
|
|
|
if (count == 0) {//插入操作
|
|
|
//查询所有列
|
|
|
- List<Map<String, String>> dynamicFieldList = this.baseMapper.selectDynamicSopAll(tableName);
|
|
|
+ List<Map<String, String>> dynamicFieldList = this.baseMapper.selectDynamicSopAll(databaseName, tableName);
|
|
|
Map<String, Object> map = new LinkedHashMap<>();
|
|
|
if (!CollectionUtils.isEmpty(dynamicFieldList)) {
|
|
|
StringJoiner stringJoinerFieldName = new StringJoiner(",");
|