From 2b310f00e8f2c21aef6e9f5de83c9c9d9ce1448b Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 10 Aug 2022 11:47:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index dcbb9be3d..7114760b6 100755 --- a/models/user.go +++ b/models/user.go @@ -1784,7 +1784,7 @@ func SearchUsers(opts *SearchUserOptions) (users []*User, _ int64, _ error) { orderby = SearchOrderByAlphabetically.String() lowerKeyword := strings.ToLower(opts.Keyword) if len(opts.Keyword) > 0 { - orderby = " CASE when lower_name='" + lowerKeyword + "' then 0 when strpos(lower_name,'" + lowerKeyword + "')>0 then 1 else 2 END ASC" + orderby = " CASE when lower_name='" + lowerKeyword + "' then 0 when strpos(lower_name,'" + lowerKeyword + "')>0 then 1 else 2 END ASC,lower_name ASC" } } sess := x.Where(cond).OrderBy(orderby) From 656ee96e8a4773fcb0fc1520b44fad03f7cd5a11 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 10 Aug 2022 14:15:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index 7114760b6..29beeec57 100755 --- a/models/user.go +++ b/models/user.go @@ -1784,7 +1784,7 @@ func SearchUsers(opts *SearchUserOptions) (users []*User, _ int64, _ error) { orderby = SearchOrderByAlphabetically.String() lowerKeyword := strings.ToLower(opts.Keyword) if len(opts.Keyword) > 0 { - orderby = " CASE when lower_name='" + lowerKeyword + "' then 0 when strpos(lower_name,'" + lowerKeyword + "')>0 then 1 else 2 END ASC,lower_name ASC" + orderby = "CASE when lower_name='" + lowerKeyword + "' then 0 when strpos(lower_name,'" + lowerKeyword + "')>0 then 1 else 2 END ASC" } } sess := x.Where(cond).OrderBy(orderby) From 6e2ba0c2298a03bdce60ade3fa8e29fb889fd201 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 10 Aug 2022 14:26:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index 29beeec57..a308d9cba 100755 --- a/models/user.go +++ b/models/user.go @@ -1784,7 +1784,7 @@ func SearchUsers(opts *SearchUserOptions) (users []*User, _ int64, _ error) { orderby = SearchOrderByAlphabetically.String() lowerKeyword := strings.ToLower(opts.Keyword) if len(opts.Keyword) > 0 { - orderby = "CASE when lower_name='" + lowerKeyword + "' then 0 when strpos(lower_name,'" + lowerKeyword + "')>0 then 1 else 2 END ASC" + orderby = "CASE when lower_name='" + lowerKeyword + "' then 0 when strpos(lower_name,'" + lowerKeyword + "')>0 then 1 else 2 END ASC,lower_name ASC" } } sess := x.Where(cond).OrderBy(orderby)