Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

2 years ago · 116a17559c
parent 7d66332417 900a936eea
commit 116a17559c
1 changed files with 5 additions and 1 deletions
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/TreeSelect.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/TreeSelect.java
@ -63,7 +63,11 @@ public class TreeSelect implements Serializable {

    public TreeSelect(WxScriptTemplate wxScriptTemplate) {
        this.id = wxScriptTemplate.getId();
-        this.label = wxScriptTemplate.getTitile();
+        if (wxScriptTemplate.getParentId() == 0) {
+            this.label = wxScriptTemplate.getScriptName();
+        } else {
+            this.label = wxScriptTemplate.getTitile();
+        }
        this.content = wxScriptTemplate.getContent();
        this.children = wxScriptTemplate.getScriptTemplateChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
    }