diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 15569178f..103825cb5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -25,7 +25,7 @@ user: #Spring配置 spring: thymeleaf: - mode: LEGACYHTML5 + mode: HTML cache: false messages: #国际化资源文件路径 diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml index 865446019..4d95102ea 100644 --- a/src/main/resources/mybatis/system/UserMapper.xml +++ b/src/main/resources/mybatis/system/UserMapper.xml @@ -35,13 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/src/main/resources/static/ruoyi/system/user/user.js b/src/main/resources/static/ruoyi/system/user/user.js index a07000d47..0b1fead1f 100644 --- a/src/main/resources/static/ruoyi/system/user/user.js +++ b/src/main/resources/static/ruoyi/system/user/user.js @@ -23,6 +23,10 @@ function queryUserList() { field: 'userName', title: '用户名称' }, + { + field: 'dept.deptName', + title: '部门' + }, { field: 'email', title: '邮箱' diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html index e5e000226..61643cb31 100644 --- a/src/main/resources/templates/error/404.html +++ b/src/main/resources/templates/error/404.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/error/500.html b/src/main/resources/templates/error/500.html index 678020c0c..200dacc99 100644 --- a/src/main/resources/templates/error/500.html +++ b/src/main/resources/templates/error/500.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/error/unauth.html b/src/main/resources/templates/error/unauth.html index 56217dead..0be6a56dd 100644 --- a/src/main/resources/templates/error/unauth.html +++ b/src/main/resources/templates/error/unauth.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 81038cfe3..53c1bb906 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 302640ce6..b51b4bdd0 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,6 +1,5 @@ - - + diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html index 724ad910d..e078f81df 100644 --- a/src/main/resources/templates/main.html +++ b/src/main/resources/templates/main.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/monitor/job/add.html b/src/main/resources/templates/monitor/job/add.html index 8ccda0d48..6782c35b8 100644 --- a/src/main/resources/templates/monitor/job/add.html +++ b/src/main/resources/templates/monitor/job/add.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/monitor/job/edit.html b/src/main/resources/templates/monitor/job/edit.html index b67db35ea..d3dc14d83 100644 --- a/src/main/resources/templates/monitor/job/edit.html +++ b/src/main/resources/templates/monitor/job/edit.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/monitor/job/job.html b/src/main/resources/templates/monitor/job/job.html index f7bfaba64..65ebf43af 100644 --- a/src/main/resources/templates/monitor/job/job.html +++ b/src/main/resources/templates/monitor/job/job.html @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/templates/monitor/job/jobLog.html b/src/main/resources/templates/monitor/job/jobLog.html index 95d227b6d..0ca243624 100644 --- a/src/main/resources/templates/monitor/job/jobLog.html +++ b/src/main/resources/templates/monitor/job/jobLog.html @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/templates/monitor/logininfor/logininfor.html b/src/main/resources/templates/monitor/logininfor/logininfor.html index 9d98fc633..bd503d2db 100644 --- a/src/main/resources/templates/monitor/logininfor/logininfor.html +++ b/src/main/resources/templates/monitor/logininfor/logininfor.html @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/templates/monitor/online/online.html b/src/main/resources/templates/monitor/online/online.html index 55a050db8..0a64a5309 100644 --- a/src/main/resources/templates/monitor/online/online.html +++ b/src/main/resources/templates/monitor/online/online.html @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/templates/monitor/operlog/detail.html b/src/main/resources/templates/monitor/operlog/detail.html index 02f15f2dd..ca1e1fe17 100644 --- a/src/main/resources/templates/monitor/operlog/detail.html +++ b/src/main/resources/templates/monitor/operlog/detail.html @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/templates/monitor/operlog/operlog.html b/src/main/resources/templates/monitor/operlog/operlog.html index b4b3e4212..81f6d0c34 100644 --- a/src/main/resources/templates/monitor/operlog/operlog.html +++ b/src/main/resources/templates/monitor/operlog/operlog.html @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/templates/system/config/add.html b/src/main/resources/templates/system/config/add.html index aab67b52e..6344908bc 100644 --- a/src/main/resources/templates/system/config/add.html +++ b/src/main/resources/templates/system/config/add.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/config/config.html b/src/main/resources/templates/system/config/config.html index 2f410aa5b..92b9eaac8 100644 --- a/src/main/resources/templates/system/config/config.html +++ b/src/main/resources/templates/system/config/config.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/config/edit.html b/src/main/resources/templates/system/config/edit.html index 39e94feac..a5c7d0dc2 100644 --- a/src/main/resources/templates/system/config/edit.html +++ b/src/main/resources/templates/system/config/edit.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/dept/add.html b/src/main/resources/templates/system/dept/add.html index 3ed0a9d5f..dc7d50f18 100644 --- a/src/main/resources/templates/system/dept/add.html +++ b/src/main/resources/templates/system/dept/add.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/dept/dept.html b/src/main/resources/templates/system/dept/dept.html index 5cc6cfeb7..70288f69e 100644 --- a/src/main/resources/templates/system/dept/dept.html +++ b/src/main/resources/templates/system/dept/dept.html @@ -1,5 +1,6 @@ - + diff --git a/src/main/resources/templates/system/dept/edit.html b/src/main/resources/templates/system/dept/edit.html index eb6ed7b4a..4604f687e 100644 --- a/src/main/resources/templates/system/dept/edit.html +++ b/src/main/resources/templates/system/dept/edit.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/dept/tree.html b/src/main/resources/templates/system/dept/tree.html index 10996dcff..b34c1cd80 100644 --- a/src/main/resources/templates/system/dept/tree.html +++ b/src/main/resources/templates/system/dept/tree.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/dict/data/add.html b/src/main/resources/templates/system/dict/data/add.html index b228b7da8..f9d2c1bd0 100644 --- a/src/main/resources/templates/system/dict/data/add.html +++ b/src/main/resources/templates/system/dict/data/add.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/dict/data/data.html b/src/main/resources/templates/system/dict/data/data.html index c1ea9d592..1bede3eba 100644 --- a/src/main/resources/templates/system/dict/data/data.html +++ b/src/main/resources/templates/system/dict/data/data.html @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/templates/system/dict/data/edit.html b/src/main/resources/templates/system/dict/data/edit.html index 259915c99..09b0d1f92 100644 --- a/src/main/resources/templates/system/dict/data/edit.html +++ b/src/main/resources/templates/system/dict/data/edit.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/menu/add.html b/src/main/resources/templates/system/menu/add.html index 15fafbb60..209606c07 100644 --- a/src/main/resources/templates/system/menu/add.html +++ b/src/main/resources/templates/system/menu/add.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/menu/edit.html b/src/main/resources/templates/system/menu/edit.html index 6a01704df..746eec1b7 100644 --- a/src/main/resources/templates/system/menu/edit.html +++ b/src/main/resources/templates/system/menu/edit.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/menu/icon.html b/src/main/resources/templates/system/menu/icon.html index 78adb044d..f9f7f1944 100644 --- a/src/main/resources/templates/system/menu/icon.html +++ b/src/main/resources/templates/system/menu/icon.html @@ -1,5 +1,5 @@ - + Font Awesome Ico list diff --git a/src/main/resources/templates/system/menu/menu.html b/src/main/resources/templates/system/menu/menu.html index 205ae7177..a31858792 100644 --- a/src/main/resources/templates/system/menu/menu.html +++ b/src/main/resources/templates/system/menu/menu.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/menu/tree.html b/src/main/resources/templates/system/menu/tree.html index e4f69dc03..b4e83b5b8 100644 --- a/src/main/resources/templates/system/menu/tree.html +++ b/src/main/resources/templates/system/menu/tree.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/post/add.html b/src/main/resources/templates/system/post/add.html index 40ee7169b..7264a846b 100644 --- a/src/main/resources/templates/system/post/add.html +++ b/src/main/resources/templates/system/post/add.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/post/edit.html b/src/main/resources/templates/system/post/edit.html index eb60b3ecb..abf3e02c7 100644 --- a/src/main/resources/templates/system/post/edit.html +++ b/src/main/resources/templates/system/post/edit.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/post/post.html b/src/main/resources/templates/system/post/post.html index b5646adff..a84abb28b 100644 --- a/src/main/resources/templates/system/post/post.html +++ b/src/main/resources/templates/system/post/post.html @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/templates/system/role/add.html b/src/main/resources/templates/system/role/add.html index bd236450f..b4dcd0b42 100644 --- a/src/main/resources/templates/system/role/add.html +++ b/src/main/resources/templates/system/role/add.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/role/edit.html b/src/main/resources/templates/system/role/edit.html index f0e0df2b7..ed9935043 100644 --- a/src/main/resources/templates/system/role/edit.html +++ b/src/main/resources/templates/system/role/edit.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/role/role.html b/src/main/resources/templates/system/role/role.html index f615d7e04..dc38e2ba4 100644 --- a/src/main/resources/templates/system/role/role.html +++ b/src/main/resources/templates/system/role/role.html @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/templates/system/user/add.html b/src/main/resources/templates/system/user/add.html index a88b8978c..157a4af69 100644 --- a/src/main/resources/templates/system/user/add.html +++ b/src/main/resources/templates/system/user/add.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/user/edit.html b/src/main/resources/templates/system/user/edit.html index 7a922fc0a..cc4596b61 100644 --- a/src/main/resources/templates/system/user/edit.html +++ b/src/main/resources/templates/system/user/edit.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/user/profile/avatar.html b/src/main/resources/templates/system/user/profile/avatar.html index a859dd6a6..a3b017068 100644 --- a/src/main/resources/templates/system/user/profile/avatar.html +++ b/src/main/resources/templates/system/user/profile/avatar.html @@ -1,5 +1,5 @@ - + 用户头像修改 diff --git a/src/main/resources/templates/system/user/profile/edit.html b/src/main/resources/templates/system/user/profile/edit.html index f4ebf6aff..c9121462e 100644 --- a/src/main/resources/templates/system/user/profile/edit.html +++ b/src/main/resources/templates/system/user/profile/edit.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/user/profile/profile.html b/src/main/resources/templates/system/user/profile/profile.html index c75b7a8cd..a33f13166 100644 --- a/src/main/resources/templates/system/user/profile/profile.html +++ b/src/main/resources/templates/system/user/profile/profile.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/user/profile/resetPwd.html b/src/main/resources/templates/system/user/profile/resetPwd.html index 778324c7f..e939de0c6 100644 --- a/src/main/resources/templates/system/user/profile/resetPwd.html +++ b/src/main/resources/templates/system/user/profile/resetPwd.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/user/resetPwd.html b/src/main/resources/templates/system/user/resetPwd.html index b1a49222d..7986f135a 100644 --- a/src/main/resources/templates/system/user/resetPwd.html +++ b/src/main/resources/templates/system/user/resetPwd.html @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/templates/system/user/user.html b/src/main/resources/templates/system/user/user.html index afcf1b85e..caa6215d9 100644 --- a/src/main/resources/templates/system/user/user.html +++ b/src/main/resources/templates/system/user/user.html @@ -1,5 +1,5 @@ - diff --git a/src/main/resources/templates/tool/build/build.html b/src/main/resources/templates/tool/build/build.html index cf7e76d72..6724e91b4 100644 --- a/src/main/resources/templates/tool/build/build.html +++ b/src/main/resources/templates/tool/build/build.html @@ -1,6 +1,5 @@ - + diff --git a/src/main/resources/templates/tool/gen/gen.html b/src/main/resources/templates/tool/gen/gen.html index 5a9709a0e..2d4991b8d 100644 --- a/src/main/resources/templates/tool/gen/gen.html +++ b/src/main/resources/templates/tool/gen/gen.html @@ -1,6 +1,5 @@ - + diff --git a/src/main/resources/templates/vm/html/add.html.vm b/src/main/resources/templates/vm/html/add.html.vm index 79bb32b83..2b85c474e 100644 --- a/src/main/resources/templates/vm/html/add.html.vm +++ b/src/main/resources/templates/vm/html/add.html.vm @@ -1,5 +1,5 @@ - - + + diff --git a/src/main/resources/templates/vm/html/edit.html.vm b/src/main/resources/templates/vm/html/edit.html.vm index 0cfd4e06b..67ec92182 100644 --- a/src/main/resources/templates/vm/html/edit.html.vm +++ b/src/main/resources/templates/vm/html/edit.html.vm @@ -1,5 +1,5 @@ - - + + diff --git a/src/main/resources/templates/vm/html/list.html.vm b/src/main/resources/templates/vm/html/list.html.vm index e87de5628..6486d0e29 100644 --- a/src/main/resources/templates/vm/html/list.html.vm +++ b/src/main/resources/templates/vm/html/list.html.vm @@ -1,5 +1,5 @@ - - + +