From ead64dc7765e7937ae3624cb714b4ae2213700fc Mon Sep 17 00:00:00 2001
From: hoteas <deng1993624>
Date: Fri, 4 Nov 2022 02:55:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/makecode.go            |   8 +-
 example/config/adminDB.json | 846 ++++++++++++++++++------------------
 2 files changed, 427 insertions(+), 427 deletions(-)

diff --git a/code/makecode.go b/code/makecode.go
index b5db2d8..74d99b1 100644
--- a/code/makecode.go
+++ b/code/makecode.go
@@ -907,10 +907,10 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req
 			//		hasUser = true
 			//	}
 			//
-			//	reqValue := req.FormValue(v.GetString("name"))
-			//	if reqValue != "" {
-			//		data[table+"."+v.GetString("name")] = reqValue
-			//	}
+			reqValue := req.FormValue(v.GetString("name"))
+			if reqValue != "" {
+				data[table+"."+v.GetString("name")] = reqValue
+			}
 			//
 			//} else {
 
diff --git a/example/config/adminDB.json b/example/config/adminDB.json
index fbbbd71..2e9c6bb 100644
--- a/example/config/adminDB.json
+++ b/example/config/adminDB.json
@@ -74,198 +74,8 @@
 				"show"
 			],
 			"icon": "Setting",
-			"label": "ebw_user",
+			"label": "飘窗",
 			"menus": [
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_user",
-					"table": "ebw_user"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"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": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "中间",
-					"table": "swiper_center"
-				},
 				{
 					"auth": [
 						"show",
@@ -290,6 +100,30 @@
 					"label": "底部",
 					"table": "swiper_bottom"
 				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "关联专题",
+					"table": "swiper_point"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "中间",
+					"table": "swiper_center"
+				},
 				{
 					"auth": [
 						"show",
@@ -301,10 +135,176 @@
 					],
 					"label": "顶部",
 					"table": "swiper_top"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "外部系统",
+					"table": "swiper_sys"
 				}
 			],
 			"name": "sys:swiper"
 		},
+		{
+			"auth": [
+				"show"
+			],
+			"icon": "Setting",
+			"label": "ebw_news",
+			"menus": [
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_news",
+					"table": "ebw_news"
+				},
+				{
+					"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_res",
+					"table": "ebw_res"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_customer",
+					"table": "ebw_customer"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_vote_option",
+					"table": "ebw_vote_option"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_vote_user",
+					"table": "ebw_vote_user"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_jobs",
+					"table": "ebw_jobs"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_user",
+					"table": "ebw_user"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_annex",
+					"table": "ebw_annex"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_attachment",
+					"table": "ebw_attachment"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_items",
+					"table": "ebw_items"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_vote",
+					"table": "ebw_vote"
+				}
+			],
+			"name": "sys:ebw"
+		},
 		{
 			"auth": [
 				"show"
@@ -312,6 +312,38 @@
 			"icon": "Setting",
 			"label": "系统管理",
 			"menus": [
+				{
+					"auth": [
+						"show",
+						"download"
+					],
+					"label": "日志管理",
+					"table": "logs"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "人员管理",
+					"table": "admin"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "组织管理",
+					"table": "org"
+				},
 				{
 					"auth": [
 						"show",
@@ -335,38 +367,6 @@
 					],
 					"label": "角色管理",
 					"table": "role"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "人员管理",
-					"table": "admin"
-				},
-				{
-					"auth": [
-						"show",
-						"download"
-					],
-					"label": "日志管理",
-					"table": "logs"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "组织管理",
-					"table": "org"
 				}
 			],
 			"name": "sys"
@@ -376,7 +376,7 @@
 				"show"
 			],
 			"icon": "Setting",
-			"label": "总经理信箱",
+			"label": "党委书记信箱",
 			"menus": [
 				{
 					"auth": [
@@ -387,8 +387,8 @@
 						"info",
 						"download"
 					],
-					"label": "总经理信箱",
-					"table": "mail"
+					"label": "党委书记信箱",
+					"table": "mail_part"
 				},
 				{
 					"auth": [
@@ -411,8 +411,8 @@
 						"info",
 						"download"
 					],
-					"label": "党委书记信箱",
-					"table": "mail_part"
+					"label": "总经理信箱",
+					"table": "mail"
 				}
 			],
 			"name": "sys:mail"
@@ -445,8 +445,8 @@
 						"info",
 						"download"
 					],
-					"label": "关联栏目",
-					"table": "ctg_article"
+					"label": "栏目管理",
+					"table": "ctg_copy"
 				},
 				{
 					"auth": [
@@ -457,8 +457,8 @@
 						"info",
 						"download"
 					],
-					"label": "栏目管理",
-					"table": "ctg_copy"
+					"label": "关联栏目",
+					"table": "ctg_article"
 				}
 			],
 			"name": "sys:ctg"
@@ -569,6 +569,10 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "ID",
+							"value": "id"
+						},
 						{
 							"name": "职位",
 							"value": "title"
@@ -577,10 +581,6 @@
 							"name": "名称",
 							"value": "name"
 						},
-						{
-							"name": "ID",
-							"value": "id"
-						},
 						{
 							"name": "手机号",
 							"value": "phone"
@@ -788,29 +788,29 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "来源",
-							"value": "origin"
-						},
-						{
-							"name": "标题",
-							"value": "title"
-						},
 						{
 							"name": "描述",
 							"value": "description"
 						},
-						{
-							"name": "正文",
-							"value": "content"
-						},
 						{
 							"name": "id",
 							"value": "id"
 						},
+						{
+							"name": "标题",
+							"value": "title"
+						},
+						{
+							"name": "正文",
+							"value": "content"
+						},
 						{
 							"name": "编号",
 							"value": "sn"
+						},
+						{
+							"name": "来源",
+							"value": "origin"
 						}
 					],
 					"type": "search",
@@ -824,6 +824,10 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "变更时间",
+							"value": "modify_time"
+						},
 						{
 							"name": "创建时间",
 							"value": "create_time"
@@ -831,10 +835,6 @@
 						{
 							"name": "推送时间",
 							"value": "push_time"
-						},
-						{
-							"name": "变更时间",
-							"value": "modify_time"
 						}
 					],
 					"type": "search",
@@ -1016,12 +1016,12 @@
 							"value": null
 						},
 						{
-							"name": "文章",
-							"value": "article_id"
+							"name": "源链接",
+							"value": "url"
 						},
 						{
-							"name": "板块名称",
-							"value": "name"
+							"name": "文章",
+							"value": "article_id"
 						},
 						{
 							"name": "ID",
@@ -1032,8 +1032,8 @@
 							"value": "sn"
 						},
 						{
-							"name": "源链接",
-							"value": "url"
+							"name": "板块名称",
+							"value": "name"
 						}
 					],
 					"type": "search",
@@ -1201,10 +1201,6 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "编号",
-							"value": "sn"
-						},
 						{
 							"name": "文章",
 							"value": "article_id"
@@ -1212,6 +1208,10 @@
 						{
 							"name": "id",
 							"value": "id"
+						},
+						{
+							"name": "编号",
+							"value": "sn"
 						}
 					],
 					"type": "search",
@@ -1412,14 +1412,6 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "板块名称",
-							"value": "name"
-						},
-						{
-							"name": "编码",
-							"value": "sn"
-						},
 						{
 							"name": "源链接",
 							"value": "url"
@@ -1431,6 +1423,14 @@
 						{
 							"name": "ID",
 							"value": "id"
+						},
+						{
+							"name": "板块名称",
+							"value": "name"
+						},
+						{
+							"name": "编码",
+							"value": "sn"
 						}
 					],
 					"type": "search",
@@ -1444,13 +1444,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -2460,37 +2460,13 @@
 							"name": "no",
 							"value": "no"
 						},
-						{
-							"name": "name",
-							"value": "name"
-						},
-						{
-							"name": "pass",
-							"value": "pass"
-						},
-						{
-							"name": "adrress",
-							"value": "adrress"
-						},
-						{
-							"name": "mail",
-							"value": "mail"
-						},
-						{
-							"name": "depName",
-							"value": "depName"
-						},
-						{
-							"name": "id",
-							"value": "id"
-						},
 						{
 							"name": "account",
 							"value": "account"
 						},
 						{
-							"name": "mpass",
-							"value": "mpass"
+							"name": "adrress",
+							"value": "adrress"
 						},
 						{
 							"name": "tel",
@@ -2503,6 +2479,30 @@
 						{
 							"name": "depNo",
 							"value": "depNo"
+						},
+						{
+							"name": "id",
+							"value": "id"
+						},
+						{
+							"name": "name",
+							"value": "name"
+						},
+						{
+							"name": "pass",
+							"value": "pass"
+						},
+						{
+							"name": "mpass",
+							"value": "mpass"
+						},
+						{
+							"name": "mail",
+							"value": "mail"
+						},
+						{
+							"name": "depName",
+							"value": "depName"
 						}
 					],
 					"type": "search",
@@ -2944,16 +2944,16 @@
 							"value": null
 						},
 						{
-							"name": "其他内容",
-							"value": "name"
+							"name": "IP地址",
+							"value": "ip"
 						},
 						{
 							"name": "ID",
 							"value": "id"
 						},
 						{
-							"name": "IP地址",
-							"value": "ip"
+							"name": "其他内容",
+							"value": "name"
 						}
 					],
 					"type": "search",
@@ -2993,6 +2993,30 @@
 					"type": "search",
 					"value": null
 				},
+				{
+					"label": "状态",
+					"name": "state",
+					"options": [
+						{
+							"name": "已启用",
+							"value": "0"
+						},
+						{
+							"name": "未启用",
+							"value": "1"
+						},
+						{
+							"name": "异常",
+							"value": "2"
+						},
+						{
+							"name": "全部",
+							"value": null
+						}
+					],
+					"type": "select",
+					"value": null
+				},
 				{
 					"label": "操作类型",
 					"name": "type",
@@ -3021,30 +3045,6 @@
 					"sortable": true,
 					"type": "select",
 					"value": null
-				},
-				{
-					"label": "状态",
-					"name": "state",
-					"options": [
-						{
-							"name": "已启用",
-							"value": "0"
-						},
-						{
-							"name": "未启用",
-							"value": "1"
-						},
-						{
-							"name": "异常",
-							"value": "2"
-						},
-						{
-							"name": "全部",
-							"value": null
-						}
-					],
-					"type": "select",
-					"value": null
 				}
 			],
 			"table": "logs"
@@ -3176,22 +3176,10 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "IP",
-							"value": "not_show_ip"
-						},
 						{
 							"name": "id",
 							"value": "id"
 						},
-						{
-							"name": "编号",
-							"value": "sn"
-						},
-						{
-							"name": "姓名",
-							"value": "name"
-						},
 						{
 							"name": "标题",
 							"value": "title"
@@ -3200,9 +3188,21 @@
 							"name": "内容",
 							"value": "content"
 						},
+						{
+							"name": "姓名",
+							"value": "name"
+						},
+						{
+							"name": "编号",
+							"value": "sn"
+						},
 						{
 							"name": "手机号",
 							"value": "phone"
+						},
+						{
+							"name": "IP",
+							"value": "not_show_ip"
 						}
 					],
 					"type": "search",
@@ -3441,6 +3441,18 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "标题",
+							"value": "title"
+						},
+						{
+							"name": "手机号",
+							"value": "phone"
+						},
+						{
+							"name": "IP",
+							"value": "not_show_ip"
+						},
 						{
 							"name": "id",
 							"value": "id"
@@ -3456,18 +3468,6 @@
 						{
 							"name": "姓名",
 							"value": "name"
-						},
-						{
-							"name": "手机号",
-							"value": "phone"
-						},
-						{
-							"name": "IP",
-							"value": "not_show_ip"
-						},
-						{
-							"name": "标题",
-							"value": "title"
 						}
 					],
 					"type": "search",
@@ -3481,13 +3481,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -3512,26 +3512,23 @@
 					"value": null
 				},
 				{
-					"label": "进展",
-					"name": "status",
+					"label": "是否展示",
+					"name": "show",
 					"options": [
 						{
-							"name": "未处置",
+							"name": "否",
 							"value": "0"
 						},
 						{
-							"name": "已阅读",
+							"name": "是",
 							"value": "1"
 						},
-						{
-							"name": "已处置",
-							"value": "2"
-						},
 						{
 							"name": "全部",
 							"value": null
 						}
 					],
+					"sortable": true,
 					"type": "select",
 					"value": null
 				},
@@ -3556,23 +3553,26 @@
 					"value": null
 				},
 				{
-					"label": "是否展示",
-					"name": "show",
+					"label": "进展",
+					"name": "status",
 					"options": [
 						{
-							"name": "否",
+							"name": "未处置",
 							"value": "0"
 						},
 						{
-							"name": "是",
+							"name": "已阅读",
 							"value": "1"
 						},
+						{
+							"name": "已处置",
+							"value": "2"
+						},
 						{
 							"name": "全部",
 							"value": null
 						}
 					],
-					"sortable": true,
 					"type": "select",
 					"value": null
 				}
@@ -3710,29 +3710,29 @@
 							"name": "id",
 							"value": "id"
 						},
-						{
-							"name": "标题",
-							"value": "title"
-						},
 						{
 							"name": "内容",
 							"value": "content"
 						},
+						{
+							"name": "姓名",
+							"value": "name"
+						},
 						{
 							"name": "手机号",
 							"value": "phone"
 						},
-						{
-							"name": "IP",
-							"value": "not_show_ip"
-						},
 						{
 							"name": "编号",
 							"value": "sn"
 						},
 						{
-							"name": "姓名",
-							"value": "name"
+							"name": "标题",
+							"value": "title"
+						},
+						{
+							"name": "IP",
+							"value": "not_show_ip"
 						}
 					],
 					"type": "search",
@@ -3776,6 +3776,26 @@
 					"type": "search",
 					"value": null
 				},
+				{
+					"label": "状态",
+					"name": "state",
+					"options": [
+						{
+							"name": "已启用",
+							"value": "0"
+						},
+						{
+							"name": "未启用",
+							"value": "1"
+						},
+						{
+							"name": "全部",
+							"value": null
+						}
+					],
+					"type": "select",
+					"value": null
+				},
 				{
 					"label": "进展",
 					"name": "status",
@@ -3800,26 +3820,6 @@
 					"type": "select",
 					"value": null
 				},
-				{
-					"label": "状态",
-					"name": "state",
-					"options": [
-						{
-							"name": "已启用",
-							"value": "0"
-						},
-						{
-							"name": "未启用",
-							"value": "1"
-						},
-						{
-							"name": "全部",
-							"value": null
-						}
-					],
-					"type": "select",
-					"value": null
-				},
 				{
 					"label": "是否展示",
 					"name": "show",
@@ -3952,6 +3952,10 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "板块名称",
+							"value": "name"
+						},
 						{
 							"name": "ID",
 							"value": "id"
@@ -3959,10 +3963,6 @@
 						{
 							"name": "编码",
 							"value": "sn"
-						},
-						{
-							"name": "板块名称",
-							"value": "name"
 						}
 					],
 					"type": "search",
@@ -3976,13 +3976,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "变更时间",
-							"value": "modify_time"
-						},
 						{
 							"name": "创建时间",
 							"value": "create_time"
+						},
+						{
+							"name": "变更时间",
+							"value": "modify_time"
 						}
 					],
 					"type": "search",
@@ -4428,13 +4428,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -4592,10 +4592,6 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "名称",
-							"value": "name"
-						},
 						{
 							"name": "ID",
 							"value": "id"
@@ -4603,6 +4599,10 @@
 						{
 							"name": "链接",
 							"value": "url"
+						},
+						{
+							"name": "名称",
+							"value": "name"
 						}
 					],
 					"type": "search",
@@ -4804,13 +4804,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "变更时间",
-							"value": "modify_time"
-						},
 						{
 							"name": "创建时间",
 							"value": "create_time"
+						},
+						{
+							"name": "变更时间",
+							"value": "modify_time"
 						}
 					],
 					"type": "search",
@@ -4939,6 +4939,10 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "ID",
+							"value": "id"
+						},
 						{
 							"name": "名称",
 							"value": "name"
@@ -4946,10 +4950,6 @@
 						{
 							"name": "链接",
 							"value": "url"
-						},
-						{
-							"name": "ID",
-							"value": "id"
 						}
 					],
 					"type": "search",