Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
eff96aee
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eff96aee
编写于
12月 31, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
用户撤回工单,当前节点未设置表单,撤回成功,但打开异常报未找到表单
上级
a767c816
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
8 deletion
+14
-8
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ElementFactory.java
...ssplatform/service/processing/factory/ElementFactory.java
+8
-6
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Retract.java
...cessplatform/service/processing/jaxrs/work/V2Retract.java
+6
-2
未找到文件。
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ElementFactory.java
浏览文件 @
eff96aee
...
...
@@ -92,14 +92,16 @@ public class ElementFactory extends AbstractFactory {
t
=
(
T
)
optional
.
get
();
}
else
{
t
=
this
.
entityManagerContainer
().
find
(
id
,
clz
);
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
if
(
t
!=
null
)
{
CacheManager
.
put
(
cacheCategory
,
cacheKey
,
t
);
}
}
return
t
;
}
public
Activity
getActivity
(
String
id
)
throws
Exception
{
Activity
activity
=
null
;
activity
=
this
.
get
(
id
,
ActivityType
.
agent
);
activity
=
this
.
get
(
id
,
ActivityType
.
manual
);
if
(
null
==
activity
)
{
activity
=
this
.
get
(
id
,
ActivityType
.
begin
);
if
(
null
==
activity
)
{
...
...
@@ -111,11 +113,11 @@ public class ElementFactory extends AbstractFactory {
if
(
null
==
activity
)
{
activity
=
this
.
get
(
id
,
ActivityType
.
embed
);
if
(
null
==
activity
)
{
activity
=
this
.
get
(
id
,
ActivityType
.
end
);
activity
=
this
.
get
(
id
,
ActivityType
.
split
);
if
(
null
==
activity
)
{
activity
=
this
.
get
(
id
,
ActivityType
.
invoke
);
if
(
null
==
activity
)
{
activity
=
this
.
get
(
id
,
ActivityType
.
manual
);
activity
=
this
.
get
(
id
,
ActivityType
.
agent
);
if
(
null
==
activity
)
{
activity
=
this
.
get
(
id
,
ActivityType
.
merge
);
if
(
null
==
activity
)
{
...
...
@@ -125,7 +127,7 @@ public class ElementFactory extends AbstractFactory {
if
(
null
==
activity
)
{
activity
=
this
.
get
(
id
,
ActivityType
.
service
);
if
(
null
==
activity
)
{
activity
=
this
.
get
(
id
,
ActivityType
.
split
);
activity
=
this
.
get
(
id
,
ActivityType
.
end
);
}
}
}
...
...
@@ -735,4 +737,4 @@ public class ElementFactory extends AbstractFactory {
}
return
compiledScript
;
}
}
\ No newline at end of file
}
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Retract.java
浏览文件 @
eff96aee
...
...
@@ -25,6 +25,7 @@ import com.x.processplatform.core.entity.content.Work;
import
com.x.processplatform.core.entity.content.WorkLog
;
import
com.x.processplatform.core.entity.element.Activity
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Form
;
import
com.x.processplatform.core.entity.element.Process
;
import
com.x.processplatform.core.entity.element.util.WorkLogTree
;
import
com.x.processplatform.core.entity.element.util.WorkLogTree.Node
;
...
...
@@ -99,7 +100,10 @@ class V2Retract extends BaseAction {
}
if
(
StringUtils
.
isNotEmpty
(
activity
.
getForm
()))
{
work
.
setForm
(
activity
.
getForm
());
Form
form
=
business
.
element
().
get
(
activity
.
getForm
(),
Form
.
class
);
if
(
null
!=
form
)
{
work
.
setForm
(
activity
.
getForm
());
}
}
update
(
work
,
workLog
);
...
...
@@ -269,4 +273,4 @@ class V2Retract extends BaseAction {
public
static
class
Wo
extends
WrapBoolean
{
}
}
\ No newline at end of file
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录