提交 6d7925cd 编写于 作者: NoSubject's avatar NoSubject

Merge branch 'fix/formv2look_error' into 'wrdp'

[流程平台]修复编译错误问题

See merge request o2oa/o2oa!2144
......@@ -109,7 +109,7 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
if (optional.isPresent()) {
return (Wo) optional.get();
} else {
List<String> list = new CopyOnWriteArrayList<>();
final List<String> list = new CopyOnWriteArrayList<>();
CompletableFuture<Void> _relatedForm = CompletableFuture.runAsync(() -> {
if (ListTools.isNotEmpty(form.getProperties().getRelatedFormList())) {
try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
......@@ -164,11 +164,11 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
_relatedForm.get();
_relatedScript.get();
list.add(form.getId() + form.getUpdateTime().getTime());
list = list.stream().sorted().collect(Collectors.toList());
List<String> sortList = list.stream().sorted().collect(Collectors.toList());
Wo wo = new Wo();
wo.setId(form.getId());
CRC32 crc = new CRC32();
crc.update(StringUtils.join(list, "#").getBytes());
crc.update(StringUtils.join(sortList, "#").getBytes());
wo.setCacheTag(crc.getValue() + "");
return wo;
}
......
......@@ -109,7 +109,7 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
if (optional.isPresent()) {
return (Wo) optional.get();
} else {
List<String> list = new CopyOnWriteArrayList<>();
final List<String> list = new CopyOnWriteArrayList<>();
CompletableFuture<Void> _relatedForm = CompletableFuture.runAsync(() -> {
if (ListTools.isNotEmpty(form.getProperties().getMobileRelatedFormList())) {
try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
......@@ -165,11 +165,11 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
_relatedForm.get();
_relatedScript.get();
list.add(form.getId() + form.getUpdateTime().getTime());
list = list.stream().sorted().collect(Collectors.toList());
List<String> sortList = list.stream().sorted().collect(Collectors.toList());
Wo wo = new Wo();
wo.setId(form.getId());
CRC32 crc = new CRC32();
crc.update(StringUtils.join(list, "#").getBytes());
crc.update(StringUtils.join(sortList, "#").getBytes());
wo.setCacheTag(crc.getValue() + "");
return wo;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册