Commit 5f8a8dea authored by 刘可心's avatar 刘可心

迁移6月17号修改的内容

parent 66fecffd
...@@ -35,7 +35,7 @@ public class MenuController extends Controller { ...@@ -35,7 +35,7 @@ public class MenuController extends Controller {
public void index() { public void index() {
String username = this.getAttrForStr("username"); String username = this.getAttrForStr("username");
Integer userId = Db.queryInt(Db.getSql("getUserId"), username); Integer userId = Db.queryInt(Db.getSql("getUserId"), username);
List<System> systems = System.dao.template("getSystems").find(); List<System> systems = System.dao.template("getSystems", Kv.by("username", username)).find();
Kv kvSystems = CollectionUtil.toIntMap(systems, "ID"); Kv kvSystems = CollectionUtil.toIntMap(systems, "ID");
List<Menu> menus = null; List<Menu> menus = null;
if ("admin".equals(username)) { if ("admin".equals(username)) {
......
...@@ -679,7 +679,7 @@ ...@@ -679,7 +679,7 @@
"USER_ID" NUMBER(9,0), "USER_ID" NUMBER(9,0),
"IP" VARCHAR2(50), "IP" VARCHAR2(50),
"OPERATION" VARCHAR2(2000), "OPERATION" VARCHAR2(2000),
"STATE" NUMBER(1,0), "STATE" VARCHAR2(1000),
"CREATE_TIME" TIMESTAMP(6), "CREATE_TIME" TIMESTAMP(6),
"END_TIME" TIMESTAMP(6), "END_TIME" TIMESTAMP(6),
"NAME" VARCHAR2(3000), "NAME" VARCHAR2(3000),
......
...@@ -38,7 +38,9 @@ select * from AS_USER where USERNAME=#para(0) ...@@ -38,7 +38,9 @@ select * from AS_USER where USERNAME=#para(0)
### 获取系统,应用菜单使用 ### 获取系统,应用菜单使用
#sql("getSystems") #sql("getSystems")
select ID, NAME, TITLE, TYPE, URL, DESCRIPTION from AS_SYSTEM order by ID select sys.id as ID,sys.NAME as NAME,sys.TITLE as TITLE, sys.TYPE as TYPE, sys.URL as URL, sys.DESCRIPTION as DESCRIPTION
from AS_SYSTEM sys left join as_menu me on sys.id=me.system_id where me.id in (select menu_id from as_role_menu where role_id in(select role_id from as_role_user where user_id =(select id from as_user where username='#(username)')))
group by sys.id,sys.NAME,sys.TITLE,sys.TYPE,sys.URL,sys.DESCRIPTION order by sys.ID
#end #end
### 获取系统 ### 获取系统
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment