提交 9b51b363 编写于 作者: O o2null

Merge branch 'fix/scriptText' into 'master'

修正空脚本的判断

See merge request o2oa/o2oa!1111
......@@ -300,11 +300,11 @@ public class ManualProcessor extends AbstractManualProcessor {
return true;
}
/* 使用脚本计算 */
if (StringUtils.isNotEmpty(manual.getTaskScriptText())) {
if (StringUtils.isNotEmpty(manual.getTaskScript())) {
return true;
} else {
if (StringUtils.isNotEmpty(manual.getTaskScript())) {
String clean = manual.getTaskScript().replaceAll("/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/|//.*", "");
if (StringUtils.isNotEmpty(manual.getTaskScriptText())) {
String clean = manual.getTaskScriptText().replaceAll("/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/|//.*", "");
clean = StringUtils.trimToEmpty(clean);
if (StringUtils.isNotBlank(clean)) {
return true;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册