diff --git a/code.go b/code.go index 8d4fd81..f34fae1 100644 --- a/code.go +++ b/code.go @@ -546,7 +546,7 @@ var TptProject = Proj{ column := that.MakeCodeRouter[hotimeName].TableColumns[tableName][k] - if column == nil || column["link"] == nil && !(column["list"] == nil || column["list"] == true) { + if column == nil || column["link"] == nil || !(column["list"] == nil || column["list"] == true) || v.GetCeilInt64(column.GetString("name")) == 0 { continue } @@ -571,7 +571,7 @@ var TptProject = Proj{ } reStr += column.GetString("value") - joinData := that.Db.Get(column.GetString("link"), reStr, Map{"id": v.GetCeilInt(column.GetString("name"))}) + joinData := that.Db.Get(column.GetString("link"), reStr, Map{"id": v.GetCeilInt64(column.GetString("name"))}) if joinData != nil { for kj, vj := range joinData { diff --git a/example/config/adminDB.json b/example/config/adminDB.json index b99d9ee..fbbbd71 100644 --- a/example/config/adminDB.json +++ b/example/config/adminDB.json @@ -74,7 +74,7 @@ "show" ], "icon": "Setting", - "label": "顶部", + "label": "ebw_user", "menus": [ { "auth": [ @@ -85,8 +85,8 @@ "info", "download" ], - "label": "顶部", - "table": "swiper_top" + "label": "ebw_user", + "table": "ebw_user" }, { "auth": [ @@ -97,8 +97,162 @@ "info", "download" ], - "label": "底部", - "table": "swiper_bottom" + "label": "ebw_vote", + "table": "ebw_vote" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_vote_option", + "table": "ebw_vote_option" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_attachment", + "table": "ebw_attachment" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_customer", + "table": "ebw_customer" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_res", + "table": "ebw_res" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_vote_user", + "table": "ebw_vote_user" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_items", + "table": "ebw_items" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_news", + "table": "ebw_news" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_annex", + "table": "ebw_annex" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_news_addition_res", + "table": "ebw_news_addition_res" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_jobs", + "table": "ebw_jobs" + } + ], + "name": "sys:ebw" + }, + { + "auth": [ + "show" + ], + "icon": "Setting", + "label": "关联专题", + "menus": [ + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "关联专题", + "table": "swiper_point" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "外部系统", + "table": "swiper_sys" }, { "auth": [ @@ -133,8 +287,8 @@ "info", "download" ], - "label": "关联专题", - "table": "swiper_point" + "label": "底部", + "table": "swiper_bottom" }, { "auth": [ @@ -145,166 +299,12 @@ "info", "download" ], - "label": "外部系统", - "table": "swiper_sys" + "label": "顶部", + "table": "swiper_top" } ], "name": "sys:swiper" }, - { - "auth": [ - "show" - ], - "icon": "Setting", - "label": "ebw_res", - "menus": [ - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_res", - "table": "ebw_res" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_vote", - "table": "ebw_vote" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_attachment", - "table": "ebw_attachment" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_jobs", - "table": "ebw_jobs" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_news_addition_res", - "table": "ebw_news_addition_res" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_news", - "table": "ebw_news" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_user", - "table": "ebw_user" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_vote_user", - "table": "ebw_vote_user" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_annex", - "table": "ebw_annex" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_items", - "table": "ebw_items" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_vote_option", - "table": "ebw_vote_option" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_customer", - "table": "ebw_customer" - } - ], - "name": "sys:ebw" - }, { "auth": [ "show" @@ -321,8 +321,8 @@ "info", "download" ], - "label": "组织管理", - "table": "org" + "label": "文章管理", + "table": "article" }, { "auth": [ @@ -333,8 +333,20 @@ "info", "download" ], - "label": "文章管理", - "table": "article" + "label": "角色管理", + "table": "role" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "人员管理", + "table": "admin" }, { "auth": [ @@ -353,70 +365,12 @@ "info", "download" ], - "label": "人员管理", - "table": "admin" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "角色管理", - "table": "role" + "label": "组织管理", + "table": "org" } ], "name": "sys" }, - { - "auth": [ - "show" - ], - "icon": "Setting", - "label": "关联栏目", - "menus": [ - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "关联栏目", - "table": "ctg_article" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "栏目管理", - "table": "ctg_copy" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "栏目管理", - "table": "ctg" - } - ], - "name": "sys:ctg" - }, { "auth": [ "show" @@ -445,8 +399,8 @@ "info", "download" ], - "label": "党委书记信箱", - "table": "mail_part" + "label": "纪委信箱", + "table": "mail_discipline" }, { "auth": [ @@ -457,11 +411,57 @@ "info", "download" ], - "label": "纪委信箱", - "table": "mail_discipline" + "label": "党委书记信箱", + "table": "mail_part" } ], "name": "sys:mail" + }, + { + "auth": [ + "show" + ], + "icon": "Setting", + "label": "栏目管理", + "menus": [ + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "栏目管理", + "table": "ctg" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "关联栏目", + "table": "ctg_article" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "栏目管理", + "table": "ctg_copy" + } + ], + "name": "sys:ctg" } ], "name": "admin", @@ -569,14 +569,6 @@ "name": "无", "value": null }, - { - "name": "ID", - "value": "id" - }, - { - "name": "手机号", - "value": "phone" - }, { "name": "职位", "value": "title" @@ -584,6 +576,14 @@ { "name": "名称", "value": "name" + }, + { + "name": "ID", + "value": "id" + }, + { + "name": "手机号", + "value": "phone" } ], "type": "search", @@ -788,6 +788,10 @@ "name": "无", "value": null }, + { + "name": "来源", + "value": "origin" + }, { "name": "标题", "value": "title" @@ -796,21 +800,17 @@ "name": "描述", "value": "description" }, + { + "name": "正文", + "value": "content" + }, { "name": "id", "value": "id" }, - { - "name": "来源", - "value": "origin" - }, { "name": "编号", "value": "sn" - }, - { - "name": "正文", - "value": "content" } ], "type": "search", @@ -824,10 +824,6 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "创建时间", "value": "create_time" @@ -835,6 +831,10 @@ { "name": "推送时间", "value": "push_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -1020,20 +1020,20 @@ "value": "article_id" }, { - "name": "编码", - "value": "sn" - }, - { - "name": "源链接", - "value": "url" + "name": "板块名称", + "value": "name" }, { "name": "ID", "value": "id" }, { - "name": "板块名称", - "value": "name" + "name": "编码", + "value": "sn" + }, + { + "name": "源链接", + "value": "url" } ], "type": "search", @@ -1201,10 +1201,6 @@ "name": "无", "value": null }, - { - "name": "id", - "value": "id" - }, { "name": "编号", "value": "sn" @@ -1212,6 +1208,10 @@ { "name": "文章", "value": "article_id" + }, + { + "name": "id", + "value": "id" } ], "type": "search", @@ -1225,13 +1225,13 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "创建时间", "value": "create_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -1413,8 +1413,8 @@ "value": null }, { - "name": "文章", - "value": "article_id" + "name": "板块名称", + "value": "name" }, { "name": "编码", @@ -1425,12 +1425,12 @@ "value": "url" }, { - "name": "ID", - "value": "id" + "name": "文章", + "value": "article_id" }, { - "name": "板块名称", - "value": "name" + "name": "ID", + "value": "id" } ], "type": "search", @@ -1444,13 +1444,13 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "创建时间", "value": "create_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -2461,12 +2461,12 @@ "value": "no" }, { - "name": "pass", - "value": "pass" + "name": "name", + "value": "name" }, { - "name": "mpass", - "value": "mpass" + "name": "pass", + "value": "pass" }, { "name": "adrress", @@ -2476,10 +2476,6 @@ "name": "mail", "value": "mail" }, - { - "name": "depNo", - "value": "depNo" - }, { "name": "depName", "value": "depName" @@ -2493,8 +2489,8 @@ "value": "account" }, { - "name": "name", - "value": "name" + "name": "mpass", + "value": "mpass" }, { "name": "tel", @@ -2503,6 +2499,10 @@ { "name": "type", "value": "type" + }, + { + "name": "depNo", + "value": "depNo" } ], "type": "search", @@ -3180,10 +3180,22 @@ "name": "IP", "value": "not_show_ip" }, + { + "name": "id", + "value": "id" + }, { "name": "编号", "value": "sn" }, + { + "name": "姓名", + "value": "name" + }, + { + "name": "标题", + "value": "title" + }, { "name": "内容", "value": "content" @@ -3191,18 +3203,6 @@ { "name": "手机号", "value": "phone" - }, - { - "name": "id", - "value": "id" - }, - { - "name": "标题", - "value": "title" - }, - { - "name": "姓名", - "value": "name" } ], "type": "search", @@ -3246,6 +3246,30 @@ "type": "search", "value": null }, + { + "label": "进展", + "name": "status", + "options": [ + { + "name": "未处置", + "value": "0" + }, + { + "name": "已阅读", + "value": "1" + }, + { + "name": "已处置", + "value": "2" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null + }, { "label": "是否展示", "name": "show", @@ -3286,30 +3310,6 @@ ], "type": "select", "value": null - }, - { - "label": "进展", - "name": "status", - "options": [ - { - "name": "未处置", - "value": "0" - }, - { - "name": "已阅读", - "value": "1" - }, - { - "name": "已处置", - "value": "2" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null } ], "table": "mail" @@ -3442,8 +3442,8 @@ "value": null }, { - "name": "IP", - "value": "not_show_ip" + "name": "id", + "value": "id" }, { "name": "编号", @@ -3458,16 +3458,16 @@ "value": "name" }, { - "name": "id", - "value": "id" + "name": "手机号", + "value": "phone" + }, + { + "name": "IP", + "value": "not_show_ip" }, { "name": "标题", "value": "title" - }, - { - "name": "手机号", - "value": "phone" } ], "type": "search", @@ -3481,13 +3481,13 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "创建时间", "value": "create_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -3511,26 +3511,6 @@ "type": "search", "value": null }, - { - "label": "状态", - "name": "state", - "options": [ - { - "name": "已启用", - "value": "0" - }, - { - "name": "未启用", - "value": "1" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null - }, { "label": "进展", "name": "status", @@ -3555,6 +3535,26 @@ "type": "select", "value": null }, + { + "label": "状态", + "name": "state", + "options": [ + { + "name": "已启用", + "value": "0" + }, + { + "name": "未启用", + "value": "1" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null + }, { "label": "是否展示", "name": "show", @@ -3711,17 +3711,13 @@ "value": "id" }, { - "name": "编号", - "value": "sn" + "name": "标题", + "value": "title" }, { "name": "内容", "value": "content" }, - { - "name": "姓名", - "value": "name" - }, { "name": "手机号", "value": "phone" @@ -3731,8 +3727,12 @@ "value": "not_show_ip" }, { - "name": "标题", - "value": "title" + "name": "编号", + "value": "sn" + }, + { + "name": "姓名", + "value": "name" } ], "type": "search", @@ -3976,13 +3976,13 @@ "name": "无", "value": null }, - { - "name": "创建时间", - "value": "create_time" - }, { "name": "变更时间", "value": "modify_time" + }, + { + "name": "创建时间", + "value": "create_time" } ], "type": "search", @@ -4592,14 +4592,14 @@ "name": "无", "value": null }, - { - "name": "ID", - "value": "id" - }, { "name": "名称", "value": "name" }, + { + "name": "ID", + "value": "id" + }, { "name": "链接", "value": "url" @@ -4780,10 +4780,6 @@ "name": "无", "value": null }, - { - "name": "链接", - "value": "url" - }, { "name": "ID", "value": "id" @@ -4791,6 +4787,10 @@ { "name": "名称", "value": "name" + }, + { + "name": "链接", + "value": "url" } ], "type": "search", @@ -4804,13 +4804,13 @@ "name": "无", "value": null }, - { - "name": "创建时间", - "value": "create_time" - }, { "name": "变更时间", "value": "modify_time" + }, + { + "name": "创建时间", + "value": "create_time" } ], "type": "search", @@ -4939,10 +4939,6 @@ "name": "无", "value": null }, - { - "name": "ID", - "value": "id" - }, { "name": "名称", "value": "name" @@ -4950,6 +4946,10 @@ { "name": "链接", "value": "url" + }, + { + "name": "ID", + "value": "id" } ], "type": "search",