From c2468a7389711f94ac4a958866b0bfa819009ce9 Mon Sep 17 00:00:00 2001
From: hoteas <deng1993624>
Date: Fri, 16 Sep 2022 07:10:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/makecode.go | 33 +++++++++++++++++++++------------
 common/func.go   | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/code/makecode.go b/code/makecode.go
index 02de126..5f26007 100644
--- a/code/makecode.go
+++ b/code/makecode.go
@@ -1069,9 +1069,10 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 				parentID = userData.GetCeilInt(table + "_id")
 				data["OR"] = Map{table + ".id": parentID, table + ".parent_id": nil}
 			} else {
+				//是否展示全部子级
+				where := Map{}
+				if req.FormValue("showall") == "1" {
 
-				if req.FormValue("showself") != "" {
-					where := Map{}
 					for _, v := range reqValue {
 						if len(where) == 0 {
 							where[table+"."+parent_idsStr] = "," + v + ","
@@ -1079,9 +1080,21 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 						}
 						where = Map{"OR": where, table + "." + parent_idsStr: "," + v + ","}
 					}
-					data["OR"] = Map{"OR": where, table + ".id": reqValue}
+
 				} else {
-					data[table+".parent_id"] = reqValue
+					where[table+".parent_id"] = reqValue
+				}
+				//是否展示自己
+				if req.FormValue("showself") == "1" {
+					if len(where) == 0 {
+						data["OR"] = Map{table + ".id": reqValue}
+					} else {
+						data["OR"] = Map{"OR": where, table + ".id": reqValue}
+					}
+				} else {
+					if len(where) != 0 {
+						data["OR"] = where
+					}
 				}
 
 			}
@@ -1093,14 +1106,9 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 			if parent_idsStr != "" {
 
 				where := Map{}
-				if len(reqValue) == 1 {
-					if len(where) == 0 {
-						where[table+"."+searchItem.GetString("name")] = reqValue[0]
-
-					} else {
-						where = Map{"OR": where, table + "." + searchItem.GetString("name"): reqValue[0]}
-					}
-
+				//是否全部展示
+				if req.FormValue("showall") != "1" {
+					where[table+"."+searchItem.GetString("name")] = reqValue
 				} else {
 					for _, v := range reqValue {
 						if len(where) == 0 {
@@ -1110,6 +1118,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 						where = Map{"OR": where, searchItem.GetString("link") + "." + parent_idsStr: "," + v + ","}
 					}
 				}
+
 				//用户
 				if userData[searchItem.GetString("name")] != nil {
 
diff --git a/common/func.go b/common/func.go
index 054b34f..7f555d2 100644
--- a/common/func.go
+++ b/common/func.go
@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"math"
 	"strings"
+	"time"
 )
 
 //安全锁
@@ -36,6 +37,42 @@ func StrFirstToUpper(str string) string {
 	return strings.ToUpper(first) + other
 }
 
+// 时间转字符串，第二个参数支持1-5对应显示年月日时分秒
+func Time2Str(t *time.Time, qu ...interface{}) string {
+	if t == nil || t.Unix() < 0 {
+		return ""
+	}
+	tp := 5
+	if len(qu) != 0 {
+		tp = (qu[0]).(int)
+	}
+
+	switch tp {
+	case 1:
+		return t.Format("2006-01")
+	case 2:
+		return t.Format("2006-01-02")
+	case 3:
+		return t.Format("2006-01-02 15")
+	case 4:
+		return t.Format("2006-01-02 15:04")
+	case 5:
+		return t.Format("2006-01-02 15:04:05")
+	case 12:
+		return t.Format("01-02")
+	case 14:
+		return t.Format("01-02 15:04")
+	case 15:
+		return t.Format("01-02 15:04:05")
+	case 34:
+		return t.Format("15:04")
+	case 35:
+		return t.Format("15:04:05")
+	}
+	return t.Format("2006-01-02 15:04:05")
+
+}
+
 // StrLd 相似度计算 ld compares two strings and returns the levenshtein distance between them.
 func StrLd(s, t string, ignoreCase bool) int {
 	if ignoreCase {