From 0392eab12923c3b1bd940ecf6be340b08ed8f123 Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Wed, 29 Dec 2021 19:12:33 +0800
Subject: [PATCH 1/5] nil return modify
---
pkg/common/db/mysql_model/im_mysql_model/user_model.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_model.go
index fbc382718..c4ed8686a 100644
--- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go
@@ -109,11 +109,13 @@ func SelectAllUserID() ([]string, error) {
func SelectSomeUserID(userIDList []string) ([]string, error) {
dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+ dbConn.LogMode(true)
if err != nil {
return nil, err
}
var resultArr []string
err = dbConn.Table("user").Where("(user_id) IN ? ", userIDList).Pluck("user_id", &resultArr).Error
+
if err != nil {
return nil, err
}
From de8ac684668f69efb51bef4b1427a55dc705e80f Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Wed, 29 Dec 2021 19:17:43 +0800
Subject: [PATCH 2/5] nil return modify
---
pkg/common/db/mysql_model/im_mysql_model/user_model.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_model.go
index c4ed8686a..42d573b5e 100644
--- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go
@@ -114,7 +114,7 @@ func SelectSomeUserID(userIDList []string) ([]string, error) {
return nil, err
}
var resultArr []string
- err = dbConn.Table("user").Where("(user_id) IN ? ", userIDList).Pluck("user_id", &resultArr).Error
+ err = dbConn.Table("user").Where("user_id IN (?) ", userIDList).Pluck("user_id", &resultArr).Error
if err != nil {
return nil, err
From b4935fef767eaaa3c6a905006ca23ee213a60d62 Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Wed, 29 Dec 2021 19:33:54 +0800
Subject: [PATCH 3/5] nil return modify
---
pkg/common/db/mysql_model/im_mysql_model/user_model.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_model.go
index 42d573b5e..0f0396be8 100644
--- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go
@@ -114,7 +114,7 @@ func SelectSomeUserID(userIDList []string) ([]string, error) {
return nil, err
}
var resultArr []string
- err = dbConn.Table("user").Where("user_id IN (?) ", userIDList).Pluck("user_id", &resultArr).Error
+ err = dbConn.Table("user").Where("user_id IN (?) ", userIDList).Find(&resultArr).Error
if err != nil {
return nil, err
From 31fabb462474e4aef5531bb1ecf1ceb548d4d714 Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Wed, 29 Dec 2021 19:35:04 +0800
Subject: [PATCH 4/5] nil return modify
---
pkg/base_info/manage_api_struct.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/base_info/manage_api_struct.go b/pkg/base_info/manage_api_struct.go
index 070e2c72b..ff1fea906 100644
--- a/pkg/base_info/manage_api_struct.go
+++ b/pkg/base_info/manage_api_struct.go
@@ -29,8 +29,8 @@ type GetUsersOnlineStatusResp struct {
SuccessResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult `json:"data"`
}
type AccountCheckReq struct {
- OperationID string `json:"operationID" binding:"required"`
- UserIDList []string `json:"userIDList" binding:"required,lte=100"`
+ OperationID string `json:"operationID" binding:"required"`
+ CheckUserIDList []string `json:"checkUserIDList" binding:"required,lte=100"`
}
type AccountCheckResp struct {
CommResp
From ace5fd61bd2cc9d6fad3c26dff9aef26db77b36d Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Wed, 29 Dec 2021 19:37:52 +0800
Subject: [PATCH 5/5] nil return modify
---
pkg/common/db/mysql_model/im_mysql_model/user_model.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_model.go
index 0f0396be8..42d573b5e 100644
--- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go
@@ -114,7 +114,7 @@ func SelectSomeUserID(userIDList []string) ([]string, error) {
return nil, err
}
var resultArr []string
- err = dbConn.Table("user").Where("user_id IN (?) ", userIDList).Find(&resultArr).Error
+ err = dbConn.Table("user").Where("user_id IN (?) ", userIDList).Pluck("user_id", &resultArr).Error
if err != nil {
return nil, err