From 211f3050e9c8fda4706c27337992e299137a50f2 Mon Sep 17 00:00:00 2001
From: Kevin Wan <wanjunfeng@gmail.com>
Date: Tue, 9 Feb 2021 14:10:38 +0800
Subject: [PATCH] fix golint issues (#459)

---
 core/search/tree.go               | 8 ++++----
 tools/goctl/model/sql/test/orm.go | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/search/tree.go b/core/search/tree.go
index 0bcb3322..3779f790 100644
--- a/core/search/tree.go
+++ b/core/search/tree.go
@@ -143,11 +143,11 @@ func add(nd *node, route string, item interface{}) error {
 				}
 
 				return ErrInvalidState
-			} else {
-				child := newNode(nil)
-				children[token] = child
-				return add(child, route[i+1:], item)
 			}
+
+			child := newNode(nil)
+			children[token] = child
+			return add(child, route[i+1:], item)
 		}
 	}
 
diff --git a/tools/goctl/model/sql/test/orm.go b/tools/goctl/model/sql/test/orm.go
index 6cb35a7e..26729993 100644
--- a/tools/goctl/model/sql/test/orm.go
+++ b/tools/goctl/model/sql/test/orm.go
@@ -217,18 +217,18 @@ func unmarshalRows(v interface{}, scanner rowsScanner, strict bool) error {
 
 					if err := scanner.Scan(values...); err != nil {
 						return err
-					} else {
-						appendFn(value)
 					}
+
+					appendFn(value)
 				}
 			default:
 				return ErrUnsupportedValueType
 			}
 
 			return nil
-		} else {
-			return ErrNotSettable
 		}
+
+		return ErrNotSettable
 	default:
 		return ErrUnsupportedValueType
 	}