Browse Source

fix:用户列表查询

zqbao 10 months ago
parent
commit
af8e41d183
2 changed files with 15 additions and 15 deletions
  1. 14 14
      controllers/user.go
  2. 1 1
      models/user.go

+ 14 - 14
controllers/user.go

@@ -470,7 +470,7 @@ func (this *UserController) List() {
 	var pars []interface{}
 
 	if keyWord != "" {
-		condition += ` AND (real_name LIKE ? OR phone LIKE ? OR email LIKE ?) `
+		condition += ` AND (u.real_name LIKE ? OR u.phone LIKE ? OR u.email LIKE ?) `
 		pars = utils.GetLikeKeywordPars(pars, keyWord, 3)
 	}
 
@@ -484,37 +484,37 @@ func (this *UserController) List() {
 	}
 
 	if sellerId > 0 {
-		condition += " AND seller_id=? "
+		condition += " AND u.seller_id=? "
 		pars = append(pars, sellerId)
 	}
 	switch status {
 	case "禁用":
-		condition += " AND status=? "
+		condition += " AND u.status=? "
 		pars = append(pars, 0)
 	case "潜在":
-		condition += " AND status=? "
+		condition += " AND u.status=? "
 		pars = append(pars, 1)
 	case "正式":
-		condition += " AND status=? "
+		condition += " AND u.status=? "
 		pars = append(pars, 2)
 	case "":
-		condition += " AND (status=? OR status=?) "
+		condition += " AND (u.status=? OR u.status=?) "
 		pars = append(pars, 0, 2)
 	}
 	switch IsRegistered {
 	case "是":
-		condition += " AND is_registered=? "
+		condition += " AND u.is_registered=? "
 		pars = append(pars, true)
 	case "否":
-		condition += " AND is_registered=? "
+		condition += " AND u.is_registered=? "
 		pars = append(pars, false)
 	}
 	switch IsSubscribed {
 	case "是":
-		condition += " AND is_subscribed=? "
+		condition += " AND u.is_subscribed=? "
 		pars = append(pars, true)
 	case "否":
-		condition += " AND is_subscribed=? "
+		condition += " AND u.is_subscribed=? "
 		pars = append(pars, false)
 	}
 	if registerStartDate != "" {
@@ -523,7 +523,7 @@ func (this *UserController) List() {
 			br.Msg = "日期格式有误"
 			return
 		}
-		condition += " AND register_time>? "
+		condition += " AND u.register_time>? "
 		pars = append(pars, registerStartTime)
 	}
 	if registerEndDate != "" {
@@ -532,7 +532,7 @@ func (this *UserController) List() {
 			br.Msg = "日期格式有误"
 			return
 		}
-		condition += " AND register_time<? "
+		condition += " AND u.register_time<? "
 		pars = append(pars, registerEndTime)
 	}
 	if createStartDate != "" {
@@ -541,7 +541,7 @@ func (this *UserController) List() {
 			br.Msg = "日期格式有误"
 			return
 		}
-		condition += " AND create_time>? "
+		condition += " AND u.create_time>? "
 		pars = append(pars, createStartTime)
 	}
 	if createEndDate != "" {
@@ -550,7 +550,7 @@ func (this *UserController) List() {
 			br.Msg = "日期格式有误"
 			return
 		}
-		condition += " AND create_time<? "
+		condition += " AND u.create_time<? "
 		pars = append(pars, createEndTime)
 	}
 	if pageSize <= 0 {

+ 1 - 1
models/user.go

@@ -167,7 +167,7 @@ func GetUserReadCount(condition string, pars []interface{}) (count int, err erro
 }
 
 func GetUserCount(condition string, pars []interface{}) (count int, err error) {
-	sql := `SELECT COUNT(*) AS count FROM user WHERE 1=1 AND (phone IS NOT NULL OR email IS NOT NULL) `
+	sql := `SELECT COUNT(*) AS count FROM user AS u WHERE 1=1 AND (u.phone IS NOT NULL OR u.email IS NOT NULL) `
 	if condition != "" {
 		sql += condition
 	}