diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
index 32523f41..b101b15f 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
@@ -683,6 +683,7 @@ public class SpringBootCallable implements Callable {
Tool.outputResource("SpringBoot/resources/templates/layout/default.ftl", Tool.createFile(layout, "default.ftl"));
Tool.outputResource("SpringBoot/resources/templates/layout/home.ftl", Tool.createFile(layout, "home.ftl"));
Tool.outputResource("SpringBoot/resources/templates/screen/home.ftl", Tool.createFile(screen, "home.ftl"));
+ Tool.outputResource("SpringBoot/resources/templates/screen/help.ftl", Tool.createFile(screen, "help.ftl"));
Tool.outputResource("SpringBoot/resources/templates/screen/helpDev.ftl", Tool.createFile(screen, "helpDev.ftl"));
Tool.outputResource("SpringBoot/resources/templates/screen/login.ftl", Tool.createFile(screen, "login.ftl"));
Tool.outputResource("SpringBoot/resources/templates/403.ftl", Tool.createFile(templates, "403.ftl"));
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml
index d47b5dfb..eac36347 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml
@@ -195,7 +195,36 @@
-
-
+
+ SELECT
+
+ FROM
+
+ WHERE
+ "IS_DELETED" = 0
+
+
+
+ SELECT
+
+ FROM
+
+ WHERE "IS_DELETED" = 0
+ AND "ID" = ${r'#'}{id}
+
+
+
+ SELECT
+
+ FROM
+
+ WHERE "IS_DELETED" = 0
+ AND "ID" IN
+
+ ${r'#'}{item}
+
+
+
+
SELECT
FROM
@@ -228,34 +258,4 @@
)
-
-
- SELECT
-
- FROM
-
- WHERE
- "IS_DELETED" = 0
-
-
-
- SELECT
-
- FROM
-
- WHERE "IS_DELETED" = 0
- AND "ID" = ${r'#'}{id}
-
-
-
- SELECT
-
- FROM
-
- WHERE "IS_DELETED" = 0
- AND "ID" IN
-
- ${r'#'}{item}
-
-
\ No newline at end of file
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ResMapper.xml
index 52383618..de9d3920 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ResMapper.xml
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ResMapper.xml
@@ -224,7 +224,7 @@
-
+
SELECT
FROM
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/help.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/help.ftl
new file mode 100644
index 00000000..42f2db5c
--- /dev/null
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/help.ftl
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
index 5a7d7ebd..84ea1121 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl
@@ -335,7 +335,7 @@
var isChecked = status.checkedKeys.indexOf(item.id) !== -1;
var list = [];
- if(this.formRes.strictly) {
+ if(this.treeStrictly) {
list.push(item)
} else {
[item].forTree(function (item) {
@@ -343,7 +343,6 @@
})
}
- console.log(this.formRes.strictly)
nav.tipShow("更新中");
list.forAsync(function (item_, next) {
if (isChecked === (status.checkedKeys.indexOf(item_.id) !== -1) && item_.id !== item.id) {
diff --git a/src/main/resources/modules/SpringBoot/test/DataInit.java b/src/main/resources/modules/SpringBoot/test/DataInit.java
index 5a93aedf..4e3c2ab1 100644
--- a/src/main/resources/modules/SpringBoot/test/DataInit.java
+++ b/src/main/resources/modules/SpringBoot/test/DataInit.java
@@ -91,11 +91,14 @@ public class DataInit {
List forBase = new ArrayList<>();
{// 基础 资源
forBase.add(createRes("00", "管理系统", "WEB", "/|/index.htm"));
- forBase.add(createRes("0000", "首页", "WEB", "/home.htm"));
- forBase.add(createRes("000001", "总数数据统计", "WEB", "/ajax/wsys/data/total"));
- forBase.add(createRes("000002", "登录数据统计", "WEB", "/ajax/wsys/data/login"));
- forBase.add(createRes("000003", "任务数据统计", "WEB", "/ajax/wsys/data/task"));
- forBase.add(createRes("000004", "故障数据统计", "WEB", "/ajax/wsys/data/error"));
+ forBase.add(createRes("0000", "基础资源", "WEB", "PUB"));
+ forBase.add(createRes("000001", "首页", "WEB", "/home.htm"));
+ forBase.add(createRes("00000101", "总数数据统计", "WEB", "/ajax/wsys/data/total"));
+ forBase.add(createRes("00000102", "登录数据统计", "WEB", "/ajax/wsys/data/login"));
+ forBase.add(createRes("00000103", "任务数据统计", "WEB", "/ajax/wsys/data/task"));
+ forBase.add(createRes("00000104", "故障数据统计", "WEB", "/ajax/wsys/data/error"));
+ forBase.add(createRes("000002", "开发指导页", "WEB", "/helpDev.htm"));
+ forBase.add(createRes("000003", "使用指导页", "WEB", "/help.htm"));
}
List forDev = new ArrayList<>();