From 7e15ea4169ec923c1d742bb8560df623d4a298a2 Mon Sep 17 00:00:00 2001
From: jianzhiyao <739319867@qq.com>
Date: Fri, 14 May 2021 11:23:49 +0800
Subject: [PATCH 1/2] optimize code struct

---
 server/web/templatefunc.go | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/server/web/templatefunc.go b/server/web/templatefunc.go
index f83fc572..0fb23ffd 100644
--- a/server/web/templatefunc.go
+++ b/server/web/templatefunc.go
@@ -618,27 +618,25 @@ func eq(arg1 interface{}, arg2 ...interface{}) (bool, error) {
 			default:
 				return false, errBadComparison
 			}
-		} else {
-			switch k1 {
-			case boolKind:
-				truth = v1.Bool() == v2.Bool()
-			case complexKind:
-				truth = v1.Complex() == v2.Complex()
-			case floatKind:
-				truth = v1.Float() == v2.Float()
-			case intKind:
-				truth = v1.Int() == v2.Int()
-			case stringKind:
-				truth = v1.String() == v2.String()
-			case uintKind:
-				truth = v1.Uint() == v2.Uint()
-			default:
-				panic("invalid kind")
-			}
-		}
-		if truth {
 			return true, nil
 		}
+		switch k1 {
+		case boolKind:
+			truth = v1.Bool() == v2.Bool()
+		case complexKind:
+			truth = v1.Complex() == v2.Complex()
+		case floatKind:
+			truth = v1.Float() == v2.Float()
+		case intKind:
+			truth = v1.Int() == v2.Int()
+		case stringKind:
+			truth = v1.String() == v2.String()
+		case uintKind:
+			truth = v1.Uint() == v2.Uint()
+		default:
+			return false, errBadComparisonType
+		}
+		return truth, nil
 	}
 	return false, nil
 }

From f4d4591962fa102605f8aed4d748359fe2263ace Mon Sep 17 00:00:00 2001
From: jianzhiyao <739319867@qq.com>
Date: Fri, 14 May 2021 11:34:46 +0800
Subject: [PATCH 2/2] Update templatefunc.go

---
 server/web/templatefunc.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/web/templatefunc.go b/server/web/templatefunc.go
index 0fb23ffd..de4e8168 100644
--- a/server/web/templatefunc.go
+++ b/server/web/templatefunc.go
@@ -618,7 +618,9 @@ func eq(arg1 interface{}, arg2 ...interface{}) (bool, error) {
 			default:
 				return false, errBadComparison
 			}
-			return true, nil
+			if truth {
+				return true, nil
+			}
 		}
 		switch k1 {
 		case boolKind:
@@ -636,7 +638,9 @@ func eq(arg1 interface{}, arg2 ...interface{}) (bool, error) {
 		default:
 			return false, errBadComparisonType
 		}
-		return truth, nil
+		if truth {
+			return true, nil
+		}
 	}
 	return false, nil
 }