Browse Source

fix:修复bug

zqbao 9 months ago
parent
commit
fa1f6709b7
2 changed files with 9 additions and 7 deletions
  1. 4 2
      models/chart_permission_search_key_word_mapping.go
  2. 5 5
      models/user.go

+ 4 - 2
models/chart_permission_search_key_word_mapping.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -28,11 +29,12 @@ func GetClassifyIdsListByIds(chartPermissionIds []string) (classifyIds []string,
 	o := orm.NewOrmUsingDB("rddp")
 	sql := ` SELECT classify_id
 		FROM chart_permission_search_key_word_mapping	
-		WHERE chart_permission_id in (?) `
+		WHERE 1=1 `
 	var idsStr string
 	if len(chartPermissionIds) > 0 {
 		idsStr = strings.Join(chartPermissionIds, ",")
+		sql += fmt.Sprintf(" AND chart_permission_id in (%s) ", idsStr)
 	}
-	_, err = o.Raw(sql, idsStr).QueryRows(&classifyIds)
+	_, err = o.Raw(sql).QueryRows(&classifyIds)
 	return
 }

+ 5 - 5
models/user.go

@@ -27,7 +27,7 @@ type User struct {
 }
 
 func (u *User) Insert() (insertId int64, err error) {
-	o :=orm.NewOrm()
+	o := orm.NewOrm()
 	insertId, err = o.Insert(u)
 	return
 }
@@ -53,21 +53,21 @@ type UserItem struct {
 
 // 变更联系人是否已注册状态
 func ModifyUserRegisterStatus(userId int, status bool, registerTime, modifyTime time.Time) (err error) {
-	o :=orm.NewOrm()
+	o := orm.NewOrm()
 	sql := `UPDATE user SET is_registered=?, register_time=?, modify_time=? WHERE user_id = ? `
 	_, err = o.Raw(sql, status, registerTime, modifyTime, userId).Exec()
 	return
 }
 
 func GetUserById(userId int) (item *User, err error) {
-	o :=orm.NewOrm()
+	o := orm.NewOrm()
 	sql := `SELECT * FROM user WHERE user_id=? `
 	err = o.Raw(sql, userId).QueryRow(&item)
 	return
 }
 
 func GetUserList(condition string, pars []interface{}) (items []*User, err error) {
-	o :=orm.NewOrm()
+	o := orm.NewOrm()
 	sql := `SELECT * FROM user WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -77,7 +77,7 @@ func GetUserList(condition string, pars []interface{}) (items []*User, err error
 }
 
 func GetUserItemByPhone(phone string) (item *UserItem, err error) {
-	o :=orm.NewOrm()
+	o := orm.NewOrm()
 	sql := `SELECT * FROM user WHERE phone=? `
 	err = o.Raw(sql, phone).QueryRow(&item)
 	return