From c8f60a7d8debd0938e444f0b20475d2939c0a5d3 Mon Sep 17 00:00:00 2001 From: wangbing <1919101440@qq.com> Date: Sun, 5 Jan 2020 22:20:35 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=812323?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 66e381a2e8ef70b664fe41696c031eaba932591f --- .../module/system/mgr/ResManagerImpl.java | 3 +- .../module/system/req/ResUpdateRequest.java | 28 +++++++++++++++++++ .../templates/screen/module/system/dept.ftl | 1 - .../templates/screen/module/system/res.ftl | 26 ++++++++--------- 4 files changed, 43 insertions(+), 15 deletions(-) diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java index a9dbc139..9089499d 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java @@ -221,6 +221,7 @@ public class ResManagerImpl implements ResManager { tree.setResValue(next.getResValue()); tree.setValid(next.getValid()); tree.setRowVersion(next.getRowVersion()); + tree.setLabel(next.getResName()); if (next.getResCode() != null && next.getResCode().split("_").length == level) { allMap.put(tree.getResCode(), tree); @@ -234,7 +235,7 @@ public class ResManagerImpl implements ResManager { if (Ptree != null) break; } if (Ptree != null) { - Ptree.getChildren().add(tree); + Ptree.addChild(tree); } else { data.add(tree); } diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java index 25624a44..e74f62a3 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java @@ -48,6 +48,18 @@ public class ResUpdateRequest extends BaseUpdateRequest { @Length(min = 0, max = 255, message = "[resValue]资源内容长度不合法(0-255)") private String resValue; + /** + * 上级代码 + */ + @Length(min = 0, max = 50, message = "[supCode]上级代码长度不合法(0-50)") + private String supCode; + + /** + * 上级名称 + */ + @Length(min = 0, max = 50, message = "[supName]上级名称长度不合法(0-50)") + private String supName; + /** * 是否有效 */ @@ -94,6 +106,22 @@ public class ResUpdateRequest extends BaseUpdateRequest { this.resValue = resValue; } + public String getSupCode() { + return this.supCode; + } + + public void setSupCode(String supCode) { + this.supCode = supCode; + } + + public String getSupName() { + return this.supName; + } + + public void setSupName(String supName) { + this.supName = supName; + } + public Boolean getValid() { return this.valid; } diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl index 408a4d09..7f120acd 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl @@ -174,7 +174,6 @@ + width="80">