From 922955501e68f34fbed5ab2096790634ad4bae6c Mon Sep 17 00:00:00 2001
From: wangbing <Wb295490665>
Date: Fri, 20 Nov 2020 17:33:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=9B=BE=E8=A1=A8=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/wsys/mpr/SQLite_DataMapper.xml     |   2 +-
 .../module/wsys/req/UserCreateRequest.java    |   2 +
 .../templates/screen/module/wsys/user.ftl     |   4 +-
 .../modules/SpringBoot/test/DataInit.java     | 278 +++++++++---------
 4 files changed, 149 insertions(+), 137 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DataMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DataMapper.xml
index 15b2ec31..36f7f579 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DataMapper.xml
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_DataMapper.xml
@@ -6,7 +6,7 @@
 
     <select id="total" resultType="${domain}.module.wsys.ent.DataTotal">
         SELECT
-            ( SELECT COUNT( 1 ) + 1 FROM SYS_USER WHERE IS_DELETED = 0 AND USER_STATUS = '0' ) USER_ALL,
+            ( SELECT COUNT( 1 ) + 1 FROM SYS_USER WHERE IS_DELETED = 0 AND USER_STATUS != '0' ) USER_ALL,
             ( SELECT COUNT( 1 ) FROM SYS_TOKENS WHERE IS_DELETED = 0 AND VALID = '1' ) USER_LINE,
             ( SELECT COUNT( 1 ) FROM SYS_DEPT WHERE IS_DELETED = 0 ) DEPT_ALL,
             ( SELECT COUNT( 1 ) FROM SYS_LOGERR WHERE IS_DELETED = 0 AND LOG_STATE = '0' ) ERROR_UN,
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserCreateRequest.java
index e64c06c5..5aee3100 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserCreateRequest.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserCreateRequest.java
@@ -5,6 +5,7 @@ import ${domain}.frame.base.BaseRequest;
 import ${domain}.frame.validation.Select;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -56,6 +57,7 @@ public class UserCreateRequest extends BaseRequest {
      */
     private String deptCode;
 
+    @NotEmpty(message = "[roleCodeList]请至少选择一个角色")
     private List<String> roleCodeList;
 
     public String getUserName() {
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
index 2f19c5f9..5cd561b3 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl
@@ -262,7 +262,9 @@
                 deptCode: [
                     {min: 0, max: 50, message: '部门代码长度在 1 到 50 个字符', trigger: 'blur'}
                 ],
-                roleCodeList: []
+                roleCodeList: [
+                    {required: true, message: '用户角色不能为空', trigger: 'blur'}
+                ]
             },
             roleList: []
         },
diff --git a/src/main/resources/modules/SpringBoot/test/DataInit.java b/src/main/resources/modules/SpringBoot/test/DataInit.java
index 6df69c90..74cd0fea 100644
--- a/src/main/resources/modules/SpringBoot/test/DataInit.java
+++ b/src/main/resources/modules/SpringBoot/test/DataInit.java
@@ -88,152 +88,154 @@ public class DataInit {
 
         //region 管理员初始化
         {
+            List<Res> forBase = new ArrayList<>();
+            {// 公共资源
+                forBase.add(createRes("00", "管理系统", "WEB", "/index.htm", true));
+                forBase.add(createRes("0000", "首页", "WEB", "/home.htm", true));
+            }
+
             List<Res> forDev = new ArrayList<>();
             {// 初始化开发角色特有资源
-                forDev.add(createRes("01", "核心设置菜单", "WEB", "DEV"));
-                forDev.add(createRes("0101", "系统配置菜单", "WEB", "DEV_PROFILES"));
-                forDev.add(createRes("010101", "系统配置管理页", "WEB", "/wsys/profiles.htm"));
-                forDev.add(createRes("01010101", "系统配置模板", "WEB", "/ajax/wsys/profiles/template"));
-                forDev.add(createRes("01010102", "系统配置导入", "WEB", "/ajax/wsys/profiles/imports"));
-                forDev.add(createRes("01010103", "系统配置导出", "WEB", "/ajax/wsys/profiles/exports"));
-                forDev.add(createRes("01010104", "系统配置新增", "WEB", "/ajax/wsys/profiles/create"));
-                forDev.add(createRes("01010105", "系统配置删除", "WEB", "/ajax/wsys/profiles/delete"));
-                forDev.add(createRes("01010106", "系统配置编辑", "WEB", "/ajax/wsys/profiles/update"));
-                forDev.add(createRes("01010107", "系统配置查询", "WEB", "/ajax/wsys/profiles/find"));
-                forDev.add(createRes("01010108", "系统配置获取", "WEB", "/ajax/wsys/profiles/get"));
-                forDev.add(createRes("0102", "资源管理菜单", "WEB", "DEV_RES"));
-                forDev.add(createRes("010201", "资源管理页", "WEB", "/wsys/res.htm"));
-                forDev.add(createRes("01020101", "资源模板", "WEB", "/ajax/wsys/res/template"));
-                forDev.add(createRes("01020102", "资源导入", "WEB", "/ajax/wsys/res/imports"));
-                forDev.add(createRes("01020103", "资源导出", "WEB", "/ajax/wsys/res/exports"));
-                forDev.add(createRes("01020104", "资源新增", "WEB", "/ajax/wsys/res/create"));
-                forDev.add(createRes("01020105", "资源删除", "WEB", "/ajax/wsys/res/delete"));
-                forDev.add(createRes("01020106", "资源编辑", "WEB", "/ajax/wsys/res/update"));
-                forDev.add(createRes("01020107", "资源查询", "WEB", "/ajax/wsys/res/find"));
-                forDev.add(createRes("01020108", "资源获取", "WEB", "/ajax/wsys/res/get"));
-                forDev.add(createRes("0103", "角色管理菜单", "WEB", "DEV_ROLE"));
-                forDev.add(createRes("010301", "角色管理页", "WEB", "/wsys/role.htm"));
-                forDev.add(createRes("01030101", "角色模板", "WEB", "/ajax/wsys/role/template"));
-                forDev.add(createRes("01030102", "角色导入", "WEB", "/ajax/wsys/role/imports"));
-                forDev.add(createRes("01030103", "角色导出", "WEB", "/ajax/wsys/role/exports"));
-                forDev.add(createRes("01030104", "角色新增", "WEB", "/ajax/wsys/role/create"));
-                forDev.add(createRes("01030105", "角色删除", "WEB", "/ajax/wsys/role/delete"));
-                forDev.add(createRes("01030106", "角色更新", "WEB", "/ajax/wsys/role/update"));
-                forDev.add(createRes("01030107", "角色查询", "WEB", "/ajax/wsys/role/find"));
-                forDev.add(createRes("01030108", "角色获取", "WEB", "/ajax/wsys/role/get"));
-                forDev.add(createRes("01030109", "角色加载", "WEB", "/ajax/wsys/role/load", true));
-                forDev.add(createRes("01030110", "角色资源分配", "WEB", "/ajax/wsys/roleRes/check"));
-                forDev.add(createRes("01030111", "角色资源关系查询", "WEB", "/ajax/wsys/roleRes/find"));
-                forDev.add(createRes("01030112", "资源树查询", "WEB", "/ajax/wsys/res/tree"));
-                forDev.add(createRes("0104", "SQL任务菜单", "WEB", "DEV_TASK_SQL"));
-                forDev.add(createRes("010401", "SQL任务管理页", "WEB", "/wsys/taskSql.htm"));
-                forDev.add(createRes("01040101", "SQL任务模板", "WEB", "/ajax/wsys/taskSql/template"));
-                forDev.add(createRes("01040102", "SQL任务导入", "WEB", "/ajax/wsys/taskSql/imports"));
-                forDev.add(createRes("01040103", "SQL任务导出", "WEB", "/ajax/wsys/taskSql/exports"));
-                forDev.add(createRes("01040104", "SQL任务新增", "WEB", "/ajax/wsys/taskSql/create"));
-                forDev.add(createRes("01040105", "SQL任务删除", "WEB", "/ajax/wsys/taskSql/delete"));
-                forDev.add(createRes("01040106", "SQL任务编辑", "WEB", "/ajax/wsys/taskSql/update"));
-                forDev.add(createRes("01040107", "SQL任务查询", "WEB", "/ajax/wsys/taskSql/find"));
-                forDev.add(createRes("01040108", "SQL任务获取", "WEB", "/ajax/wsys/taskSql/get"));
-                forDev.add(createRes("0105", "应用接入管理菜单", "WEB", "DEV_VISITOR"));
-                forDev.add(createRes("010501", "应用接入管理页", "WEB", "/wsys/visitor.htm"));
-                forDev.add(createRes("01050101", "应用接入模板", "WEB", "/ajax/wsys/visitor/template"));
-                forDev.add(createRes("01050102", "应用接入导入", "WEB", "/ajax/wsys/visitor/imports"));
-                forDev.add(createRes("01050103", "应用接入导出", "WEB", "/ajax/wsys/visitor/exports"));
-                forDev.add(createRes("01050104", "应用接入新增", "WEB", "/ajax/wsys/visitor/create"));
-                forDev.add(createRes("01050105", "应用接入删除", "WEB", "/ajax/wsys/visitor/delete"));
-                forDev.add(createRes("01050106", "应用接入更新", "WEB", "/ajax/wsys/visitor/update"));
-                forDev.add(createRes("01050107", "应用接入查询", "WEB", "/ajax/wsys/visitor/find"));
-                forDev.add(createRes("01050108", "应用资源关系新增", "WEB", "/ajax/wsys/visitorRes/create"));
-                forDev.add(createRes("01050109", "应用资源关系删除", "WEB", "/ajax/wsys/visitorRes/delete"));
-                forDev.add(createRes("01050110", "应用资源关系更新", "WEB", "/ajax/wsys/visitorRes/update"));
-                forDev.add(createRes("01050111", "应用资源关系查询", "WEB", "/ajax/wsys/visitorRes/find"));
+                forDev.add(createRes("0001", "核心设置菜单", "WEB", "DEV"));
+                forDev.add(createRes("000101", "系统配置菜单", "WEB", "DEV_PROFILES"));
+                forDev.add(createRes("00010101", "系统配置管理页", "WEB", "/wsys/profiles.htm"));
+                forDev.add(createRes("0001010101", "系统配置模板", "WEB", "/ajax/wsys/profiles/template"));
+                forDev.add(createRes("0001010102", "系统配置导入", "WEB", "/ajax/wsys/profiles/imports"));
+                forDev.add(createRes("0001010103", "系统配置导出", "WEB", "/ajax/wsys/profiles/exports"));
+                forDev.add(createRes("0001010104", "系统配置新增", "WEB", "/ajax/wsys/profiles/create"));
+                forDev.add(createRes("0001010105", "系统配置删除", "WEB", "/ajax/wsys/profiles/delete"));
+                forDev.add(createRes("0001010106", "系统配置编辑", "WEB", "/ajax/wsys/profiles/update"));
+                forDev.add(createRes("0001010107", "系统配置查询", "WEB", "/ajax/wsys/profiles/find"));
+                forDev.add(createRes("0001010108", "系统配置获取", "WEB", "/ajax/wsys/profiles/get"));
+                forDev.add(createRes("000102", "资源管理菜单", "WEB", "DEV_RES"));
+                forDev.add(createRes("00010201", "资源管理页", "WEB", "/wsys/res.htm"));
+                forDev.add(createRes("0001020101", "资源模板", "WEB", "/ajax/wsys/res/template"));
+                forDev.add(createRes("0001020102", "资源导入", "WEB", "/ajax/wsys/res/imports"));
+                forDev.add(createRes("0001020103", "资源导出", "WEB", "/ajax/wsys/res/exports"));
+                forDev.add(createRes("0001020104", "资源新增", "WEB", "/ajax/wsys/res/create"));
+                forDev.add(createRes("0001020105", "资源删除", "WEB", "/ajax/wsys/res/delete"));
+                forDev.add(createRes("0001020106", "资源编辑", "WEB", "/ajax/wsys/res/update"));
+                forDev.add(createRes("0001020107", "资源查询", "WEB", "/ajax/wsys/res/find"));
+                forDev.add(createRes("0001020108", "资源获取", "WEB", "/ajax/wsys/res/get"));
+                forDev.add(createRes("000103", "角色管理菜单", "WEB", "DEV_ROLE"));
+                forDev.add(createRes("00010301", "角色管理页", "WEB", "/wsys/role.htm"));
+                forDev.add(createRes("0001030101", "角色模板", "WEB", "/ajax/wsys/role/template"));
+                forDev.add(createRes("0001030102", "角色导入", "WEB", "/ajax/wsys/role/imports"));
+                forDev.add(createRes("0001030103", "角色导出", "WEB", "/ajax/wsys/role/exports"));
+                forDev.add(createRes("0001030104", "角色新增", "WEB", "/ajax/wsys/role/create"));
+                forDev.add(createRes("0001030105", "角色删除", "WEB", "/ajax/wsys/role/delete"));
+                forDev.add(createRes("0001030106", "角色更新", "WEB", "/ajax/wsys/role/update"));
+                forDev.add(createRes("0001030107", "角色查询", "WEB", "/ajax/wsys/role/find"));
+                forDev.add(createRes("0001030108", "角色获取", "WEB", "/ajax/wsys/role/get"));
+                forDev.add(createRes("0001030109", "角色加载", "WEB", "/ajax/wsys/role/load", true));
+                forDev.add(createRes("0001030110", "角色资源分配", "WEB", "/ajax/wsys/roleRes/check"));
+                forDev.add(createRes("0001030111", "角色资源关系查询", "WEB", "/ajax/wsys/roleRes/find"));
+                forDev.add(createRes("0001030112", "资源树查询", "WEB", "/ajax/wsys/res/tree"));
+                forDev.add(createRes("000104", "SQL任务菜单", "WEB", "DEV_TASK_SQL"));
+                forDev.add(createRes("00010401", "SQL任务管理页", "WEB", "/wsys/taskSql.htm"));
+                forDev.add(createRes("0001040101", "SQL任务模板", "WEB", "/ajax/wsys/taskSql/template"));
+                forDev.add(createRes("0001040102", "SQL任务导入", "WEB", "/ajax/wsys/taskSql/imports"));
+                forDev.add(createRes("0001040103", "SQL任务导出", "WEB", "/ajax/wsys/taskSql/exports"));
+                forDev.add(createRes("0001040104", "SQL任务新增", "WEB", "/ajax/wsys/taskSql/create"));
+                forDev.add(createRes("0001040105", "SQL任务删除", "WEB", "/ajax/wsys/taskSql/delete"));
+                forDev.add(createRes("0001040106", "SQL任务编辑", "WEB", "/ajax/wsys/taskSql/update"));
+                forDev.add(createRes("0001040107", "SQL任务查询", "WEB", "/ajax/wsys/taskSql/find"));
+                forDev.add(createRes("0001040108", "SQL任务获取", "WEB", "/ajax/wsys/taskSql/get"));
+                forDev.add(createRes("000105", "应用接入管理菜单", "WEB", "DEV_VISITOR"));
+                forDev.add(createRes("00010501", "应用接入管理页", "WEB", "/wsys/visitor.htm"));
+                forDev.add(createRes("0001050101", "应用接入模板", "WEB", "/ajax/wsys/visitor/template"));
+                forDev.add(createRes("0001050102", "应用接入导入", "WEB", "/ajax/wsys/visitor/imports"));
+                forDev.add(createRes("0001050103", "应用接入导出", "WEB", "/ajax/wsys/visitor/exports"));
+                forDev.add(createRes("0001050104", "应用接入新增", "WEB", "/ajax/wsys/visitor/create"));
+                forDev.add(createRes("0001050105", "应用接入删除", "WEB", "/ajax/wsys/visitor/delete"));
+                forDev.add(createRes("0001050106", "应用接入更新", "WEB", "/ajax/wsys/visitor/update"));
+                forDev.add(createRes("0001050107", "应用接入查询", "WEB", "/ajax/wsys/visitor/find"));
+                forDev.add(createRes("0001050108", "应用资源关系新增", "WEB", "/ajax/wsys/visitorRes/create"));
+                forDev.add(createRes("0001050109", "应用资源关系删除", "WEB", "/ajax/wsys/visitorRes/delete"));
+                forDev.add(createRes("0001050110", "应用资源关系更新", "WEB", "/ajax/wsys/visitorRes/update"));
+                forDev.add(createRes("0001050111", "应用资源关系查询", "WEB", "/ajax/wsys/visitorRes/find"));
 
-                forDev.add(createRes("02", "监控运行菜单", "WEB", "MNT"));
-                forDev.add(createRes("0201", "登录管理菜单", "WEB", "MNT_TOKENS"));
-                forDev.add(createRes("020101", "登录管理页", "WEB", "/wsys/tokens.htm"));
-                forDev.add(createRes("02010101", "登录查询", "WEB", "/ajax/wsys/tokens/find"));
-                forDev.add(createRes("02010102", "登录导出", "WEB", "/ajax/wsys/tokens/exports"));
-                forDev.add(createRes("02010103", "登录注销", "WEB", "/ajax/wsys/tokens/logout"));
-                forDev.add(createRes("0202", "调度监控菜单", "WEB", "MNT_SCHEDULE"));
-                forDev.add(createRes("020201", "调度监控页", "WEB", "/wsys/schedule.htm"));
-                forDev.add(createRes("02020101", "调度监控查询", "WEB", "/ajax/wsys/schedule/find"));
-                forDev.add(createRes("02020102", "调度监控启动", "WEB", "/ajax/wsys/schedule/start"));
-                forDev.add(createRes("02020103", "调度监控暂停", "WEB", "/ajax/wsys/schedule/stop"));
-                forDev.add(createRes("0203", "任务日志管理菜单", "WEB", "MNT_LOGTASK"));
-                forDev.add(createRes("020301", "任务日志管理页", "WEB", "/wsys/logtask.htm"));
-                forDev.add(createRes("02030101", "任务日志模板", "WEB", "/ajax/wsys/logtask/template"));
-                forDev.add(createRes("02030102", "任务日志导入", "WEB", "/ajax/wsys/logtask/imports"));
-                forDev.add(createRes("02030103", "任务日志导出", "WEB", "/ajax/wsys/logtask/exports"));
-                forDev.add(createRes("02030104", "任务日志新增", "WEB", "/ajax/wsys/logtask/create"));
-                forDev.add(createRes("02030105", "任务日志删除", "WEB", "/ajax/wsys/logtask/delete"));
-                forDev.add(createRes("02030106", "任务日志更新", "WEB", "/ajax/wsys/logtask/update"));
-                forDev.add(createRes("02030107", "任务日志查询", "WEB", "/ajax/wsys/logtask/find"));
-                forDev.add(createRes("0204", "故障日志菜单", "WEB", "MNT_LOGERR"));
-                forDev.add(createRes("020401", "故障日志管理页", "WEB", "/wsys/logerr.htm"));
-                forDev.add(createRes("02040101", "故障日志删除", "WEB", "/ajax/wsys/logerr/delete"));
-                forDev.add(createRes("02040102", "故障日志更新", "WEB", "/ajax/wsys/logerr/update"));
-                forDev.add(createRes("02040103", "故障日志查询", "WEB", "/ajax/wsys/logerr/find"));
+                forDev.add(createRes("0002", "监控运行菜单", "WEB", "MNT"));
+                forDev.add(createRes("000201", "登录管理菜单", "WEB", "MNT_TOKENS"));
+                forDev.add(createRes("00020101", "登录管理页", "WEB", "/wsys/tokens.htm"));
+                forDev.add(createRes("0002010101", "登录查询", "WEB", "/ajax/wsys/tokens/find"));
+                forDev.add(createRes("0002010102", "登录导出", "WEB", "/ajax/wsys/tokens/exports"));
+                forDev.add(createRes("0002010103", "登录注销", "WEB", "/ajax/wsys/tokens/logout"));
+                forDev.add(createRes("000202", "调度监控菜单", "WEB", "MNT_SCHEDULE"));
+                forDev.add(createRes("00020201", "调度监控页", "WEB", "/wsys/schedule.htm"));
+                forDev.add(createRes("0002020101", "调度监控查询", "WEB", "/ajax/wsys/schedule/find"));
+                forDev.add(createRes("0002020102", "调度监控启动", "WEB", "/ajax/wsys/schedule/start"));
+                forDev.add(createRes("0002020103", "调度监控暂停", "WEB", "/ajax/wsys/schedule/stop"));
+                forDev.add(createRes("000203", "任务日志管理菜单", "WEB", "MNT_LOGTASK"));
+                forDev.add(createRes("00020301", "任务日志管理页", "WEB", "/wsys/logtask.htm"));
+                forDev.add(createRes("0002030101", "任务日志模板", "WEB", "/ajax/wsys/logtask/template"));
+                forDev.add(createRes("0002030102", "任务日志导入", "WEB", "/ajax/wsys/logtask/imports"));
+                forDev.add(createRes("0002030103", "任务日志导出", "WEB", "/ajax/wsys/logtask/exports"));
+                forDev.add(createRes("0002030104", "任务日志新增", "WEB", "/ajax/wsys/logtask/create"));
+                forDev.add(createRes("0002030105", "任务日志删除", "WEB", "/ajax/wsys/logtask/delete"));
+                forDev.add(createRes("0002030106", "任务日志更新", "WEB", "/ajax/wsys/logtask/update"));
+                forDev.add(createRes("0002030107", "任务日志查询", "WEB", "/ajax/wsys/logtask/find"));
+                forDev.add(createRes("000204", "故障日志菜单", "WEB", "MNT_LOGERR"));
+                forDev.add(createRes("00020401", "故障日志管理页", "WEB", "/wsys/logerr.htm"));
+                forDev.add(createRes("0002040101", "故障日志删除", "WEB", "/ajax/wsys/logerr/delete"));
+                forDev.add(createRes("0002040102", "故障日志更新", "WEB", "/ajax/wsys/logerr/update"));
+                forDev.add(createRes("0002040103", "故障日志查询", "WEB", "/ajax/wsys/logerr/find"));
             }
 
             List<Res> forMgr = new ArrayList<>();
             {// 初始化管理资源
-                forMgr.add(createRes("03", "基础设置菜单", "WEB", "SYS"));
+                forMgr.add(createRes("0003", "基础设置菜单", "WEB", "SYS"));
 
-                forMgr.add(createRes("0301", "根页", "WEB", "/", true));
-                forMgr.add(createRes("030101", "主页", "WEB", "/index.htm", true));
-                forMgr.add(createRes("030102", "首页", "WEB", "/home.htm", true));
+                forMgr.add(createRes("000302", "字典管理菜单", "WEB", "SYS_DICT"));
+                forMgr.add(createRes("00030201", "字典管理页", "WEB", "/wsys/dict.htm"));
+                forMgr.add(createRes("0003020101", "字典模板", "WEB", "/ajax/wsys/dict/template"));
+                forMgr.add(createRes("0003020102", "字典导入", "WEB", "/ajax/wsys/dict/imports"));
+                forMgr.add(createRes("0003020103", "字典导出", "WEB", "/ajax/wsys/dict/exports"));
+                forMgr.add(createRes("0003020104", "字典新建", "WEB", "/ajax/wsys/dict/create"));
+                forMgr.add(createRes("0003020105", "字典删除", "WEB", "/ajax/wsys/dict/delete"));
+                forMgr.add(createRes("0003020106", "字典更新", "WEB", "/ajax/wsys/dict/update"));
+                forMgr.add(createRes("0003020107", "字典查询", "WEB", "/ajax/wsys/dict/find"));
+                forMgr.add(createRes("0003020108", "字典获取", "WEB", "/ajax/wsys/dict/get"));
+                forMgr.add(createRes("0003020109", "字典详情", "WEB", "/ajax/wsys/dict/load", true));
+                forMgr.add(createRes("0003020110", "字典项管理页", "WEB", "/wsys/dictItem.htm"));
+                forMgr.add(createRes("000302011001", "字典项模板", "WEB", "/ajax/wsys/dictItem/template"));
+                forMgr.add(createRes("000302011002", "字典项导入", "WEB", "/ajax/wsys/dictItem/imports"));
+                forMgr.add(createRes("000302011003", "字典项导出", "WEB", "/ajax/wsys/dictItem/exports"));
+                forMgr.add(createRes("000302011004", "字典项新增", "WEB", "/ajax/wsys/dictItem/create"));
+                forMgr.add(createRes("000302011005", "字典项删除", "WEB", "/ajax/wsys/dictItem/delete"));
+                forMgr.add(createRes("000302011006", "字典项更新", "WEB", "/ajax/wsys/dictItem/update"));
+                forMgr.add(createRes("000302011007", "字典项查找", "WEB", "/ajax/wsys/dictItem/find"));
+                forMgr.add(createRes("000302011008", "字典项获取", "WEB", "/ajax/wsys/dictItem/get"));
 
-                forMgr.add(createRes("0302", "字典管理菜单", "WEB", "SYS_DICT"));
-                forMgr.add(createRes("030201", "字典管理页", "WEB", "/wsys/dict.htm"));
-                forMgr.add(createRes("03020101", "字典模板", "WEB", "/ajax/wsys/dict/template"));
-                forMgr.add(createRes("03020102", "字典导入", "WEB", "/ajax/wsys/dict/imports"));
-                forMgr.add(createRes("03020103", "字典导出", "WEB", "/ajax/wsys/dict/exports"));
-                forMgr.add(createRes("03020104", "字典新建", "WEB", "/ajax/wsys/dict/create"));
-                forMgr.add(createRes("03020105", "字典删除", "WEB", "/ajax/wsys/dict/delete"));
-                forMgr.add(createRes("03020106", "字典更新", "WEB", "/ajax/wsys/dict/update"));
-                forMgr.add(createRes("03020107", "字典查询", "WEB", "/ajax/wsys/dict/find"));
-                forMgr.add(createRes("03020108", "字典获取", "WEB", "/ajax/wsys/dict/get"));
-                forMgr.add(createRes("03020109", "字典详情", "WEB", "/ajax/wsys/dict/load", true));
-                forMgr.add(createRes("03020110", "字典项管理页", "WEB", "/wsys/dictItem.htm"));
-                forMgr.add(createRes("0302011001", "字典项模板", "WEB", "/ajax/wsys/dictItem/template"));
-                forMgr.add(createRes("0302011002", "字典项导入", "WEB", "/ajax/wsys/dictItem/imports"));
-                forMgr.add(createRes("0302011003", "字典项导出", "WEB", "/ajax/wsys/dictItem/exports"));
-                forMgr.add(createRes("0302011004", "字典项新增", "WEB", "/ajax/wsys/dictItem/create"));
-                forMgr.add(createRes("0302011005", "字典项删除", "WEB", "/ajax/wsys/dictItem/delete"));
-                forMgr.add(createRes("0302011006", "字典项更新", "WEB", "/ajax/wsys/dictItem/update"));
-                forMgr.add(createRes("0302011007", "字典项查找", "WEB", "/ajax/wsys/dictItem/find"));
-                forMgr.add(createRes("0302011008", "字典项获取", "WEB", "/ajax/wsys/dictItem/get"));
+                forMgr.add(createRes("000303", "用户管理菜单", "WEB", "SYS_USER"));
+                forMgr.add(createRes("00030301", "用户管理页", "WEB", "/wsys/user.htm"));
+                forMgr.add(createRes("0003030101", "字用户模板", "WEB", "/ajax/wsys/user/template"));
+                forMgr.add(createRes("0003030102", "用户导入", "WEB", "/ajax/wsys/user/imports"));
+                forMgr.add(createRes("0003030103", "用户导出", "WEB", "/ajax/wsys/user/exports"));
+                forMgr.add(createRes("0003030104", "用户新增", "WEB", "/ajax/wsys/user/create"));
+                forMgr.add(createRes("0003030105", "用户删除", "WEB", "/ajax/wsys/user/delete"));
+                forMgr.add(createRes("0003030106", "用户更新", "WEB", "/ajax/wsys/user/update"));
+                forMgr.add(createRes("0003030107", "用户查询", "WEB", "/ajax/wsys/user/find"));
+                forMgr.add(createRes("0003030108", "用户获取", "WEB", "/ajax/wsys/user/get"));
+                forMgr.add(createRes("0003030109", "修改密码", "WEB", "/ajax/wsys/user/changePwd", true));
+                forMgr.add(createRes("0003030110", "重置密码", "WEB", "/ajax/wsys/user/resetPwd"));
 
-                forMgr.add(createRes("0303", "用户管理菜单", "WEB", "SYS_USER"));
-                forMgr.add(createRes("030301", "用户管理页", "WEB", "/wsys/user.htm"));
-                forMgr.add(createRes("03030101", "字用户模板", "WEB", "/ajax/wsys/user/template"));
-                forMgr.add(createRes("03030102", "用户导入", "WEB", "/ajax/wsys/user/imports"));
-                forMgr.add(createRes("03030103", "用户导出", "WEB", "/ajax/wsys/user/exports"));
-                forMgr.add(createRes("03030104", "用户新增", "WEB", "/ajax/wsys/user/create"));
-                forMgr.add(createRes("03030105", "用户删除", "WEB", "/ajax/wsys/user/delete"));
-                forMgr.add(createRes("03030106", "用户更新", "WEB", "/ajax/wsys/user/update"));
-                forMgr.add(createRes("03030107", "用户查询", "WEB", "/ajax/wsys/user/find"));
-                forMgr.add(createRes("03030108", "用户获取", "WEB", "/ajax/wsys/user/get"));
-                forMgr.add(createRes("03030109", "修改密码", "WEB", "/ajax/wsys/user/changePwd", true));
-                forMgr.add(createRes("03030110", "重置密码", "WEB", "/ajax/wsys/user/resetPwd"));
+                forMgr.add(createRes("000304", "机构管理菜单", "WEB", "SYS_DEPT"));
+                forMgr.add(createRes("00030401", "机构管理页", "WEB", "/wsys/dept.htm"));
+                forMgr.add(createRes("0003040101", "机构新增", "WEB", "/ajax/wsys/dept/create"));
+                forMgr.add(createRes("0003040102", "机构删除", "WEB", "/ajax/wsys/dept/delete"));
+                forMgr.add(createRes("0003040103", "机构更新", "WEB", "/ajax/wsys/dept/update"));
+                forMgr.add(createRes("0003040104", "机构查询", "WEB", "/ajax/wsys/dept/find"));
+                forMgr.add(createRes("0003040105", "机构获取", "WEB", "/ajax/wsys/dept/get"));
+                forMgr.add(createRes("0003040106", "机构树查询", "WEB", "/ajax/wsys/dept/tree"));
+                forMgr.add(createRes("0003040107", "机构模板", "WEB", "/ajax/wsys/dept/template"));
+                forMgr.add(createRes("0003040108", "机构导入", "WEB", "/ajax/wsys/dept/imports"));
+                forMgr.add(createRes("0003040109", "机构导出", "WEB", "/ajax/wsys/dept/exports"));
 
-                forMgr.add(createRes("0304", "机构管理菜单", "WEB", "SYS_DEPT"));
-                forMgr.add(createRes("030401", "机构管理页", "WEB", "/wsys/dept.htm"));
-                forMgr.add(createRes("03040101", "机构新增", "WEB", "/ajax/wsys/dept/create"));
-                forMgr.add(createRes("03040102", "机构删除", "WEB", "/ajax/wsys/dept/delete"));
-                forMgr.add(createRes("03040103", "机构更新", "WEB", "/ajax/wsys/dept/update"));
-                forMgr.add(createRes("03040104", "机构查询", "WEB", "/ajax/wsys/dept/find"));
-                forMgr.add(createRes("03040105", "机构获取", "WEB", "/ajax/wsys/dept/get"));
-                forMgr.add(createRes("03040106", "机构树查询", "WEB", "/ajax/wsys/dept/tree"));
-                forMgr.add(createRes("03040107", "机构模板", "WEB", "/ajax/wsys/dept/template"));
-                forMgr.add(createRes("03040108", "机构导入", "WEB", "/ajax/wsys/dept/imports"));
-                forMgr.add(createRes("03040109", "机构导出", "WEB", "/ajax/wsys/dept/exports"));
-
-                forMgr.add(createRes("0305", "文件管理菜单", "WEB", "SYS_FILE"));
-                forMgr.add(createRes("030501", "文件管理页", "WEB", "/wsys/file.htm"));
-                forMgr.add(createRes("03050101", "文件删除", "WEB", "/ajax/wsys/file/delete"));
-                forMgr.add(createRes("03050102", "文件查询", "WEB", "/ajax/wsys/file/find"));
+                forMgr.add(createRes("000305", "文件管理菜单", "WEB", "SYS_FILE"));
+                forMgr.add(createRes("00030501", "文件管理页", "WEB", "/wsys/file.htm"));
+                forMgr.add(createRes("0003050101", "文件删除", "WEB", "/ajax/wsys/file/delete"));
+                forMgr.add(createRes("0003050102", "文件查询", "WEB", "/ajax/wsys/file/find"));
 
 <#list project.modules as module>
 <#assign index = module_index + 4/>
@@ -315,6 +317,9 @@ public class DataInit {
 
             {//初始化开发角色
                 Long roleId = createRole("developer", "开发", "开发");
+                for (Res res : forBase) {
+                    allocateRes(roleId, "developer", res.getId(), res.getResCode());
+                }
                 for (Res res : forDev) {
                     allocateRes(roleId, "developer", res.getId(), res.getResCode());
                 }
@@ -324,6 +329,9 @@ public class DataInit {
             }
             {//初始化管理角色
                 Long roleId = createRole("management", "管理员", "管理员");
+                for (Res res : forBase) {
+                    allocateRes(roleId, "management", res.getId(), res.getResCode());
+                }
                 for (Res res : forMgr) {
                     allocateRes(roleId, "management", res.getId(), res.getResCode());
                 }