fix:转义admin关键字

controllers/sys_admin.go

@@ -12,10 +12,11 @@ import (
 	etaTrialService "eta_gn/eta_api/services/eta_trial"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // 系统用户
@@ -168,7 +169,7 @@ func (this *SysAdminController) ListSysuser() {
 					}
 				}
 
-				if *pid > 0 {
+				if pid != nil && *pid > 0 {
 					list[i].TeamId = list[i].GroupId
 					list[i].GroupId = *pid
 				}

models/system/sys_admin.go

@@ -4,9 +4,10 @@ import (
 	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 type AdminItem struct {
@@ -47,24 +48,25 @@ type AdminItem struct {
 
 func GetSysuserList(condition string, pars []interface{}, startSize, pageSize int) (items []*AdminItem, err error) {
 	// o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE 1=1 `
+	sql := `SELECT * FROM "admin" WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY enabled DESC, last_updated_time DESC, created_time DESC LIMIT ?,?`
 	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars, startSize, pageSize).Find(&items).Error
+	pars = append(pars, startSize, pageSize)
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func GetSysuserListCount(condition string, pars []interface{}) (count int, err error) {
 	// o := orm.NewOrm()
-	sql := `SELECT COUNT(1) AS count FROM admin WHERE 1=1 `
+	sql := `SELECT COUNT(1) AS count FROM "admin" WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DEFAULT_DmSQL.Raw(sql, pars).Scan(&count).Error
+	err = global.DEFAULT_DmSQL.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -125,7 +127,7 @@ type SysuserAddReq struct {
 }
 
 func GetSysAdminCount(adminName string) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM admin WHERE admin_name=? `
+	sql := `SELECT COUNT(1) AS count FROM "admin" WHERE admin_name=? `
 	// o := orm.NewOrm()
 	//err = o.Raw(sql, adminName).QueryRow(&count)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminName).Scan(&count).Error
@@ -133,7 +135,7 @@ func GetSysAdminCount(adminName string) (count int, err error) {
 }
 
 func GetSysAdminByName(adminName string) (item *Admin, err error) {
-	sql := `SELECT * FROM admin WHERE admin_name=? `
+	sql := `SELECT * FROM "admin" WHERE admin_name=? `
 	// o := orm.NewOrm()
 	//err = o.Raw(sql, adminName).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminName).First(&item).Error
@@ -141,7 +143,7 @@ func GetSysAdminByName(adminName string) (item *Admin, err error) {
 }
 
 func GetSysAdminById(adminId int) (item *Admin, err error) {
-	sql := `SELECT * FROM admin WHERE admin_id=? `
+	sql := `SELECT * FROM "admin" WHERE admin_id=? `
 	// o := orm.NewOrm()
 	//err = o.Raw(sql, adminId).QueryRow(&item)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminId).First(&item).Error
@@ -197,7 +199,7 @@ type SysuserEditEnabledReq struct {
 // 变更状态
 func EditAdminEnabled(item *Admin) (err error) {
 	// o := orm.NewOrm()
-	sql := `UPDATE admin
+	sql := `UPDATE "admin"
 			SET
 			  last_updated_time = NOW(),enabled=? WHERE admin_id = ? `
 	//_, err = o.Raw(sql, item.Enabled, item.AdminId).Exec()
@@ -208,7 +210,7 @@ func EditAdminEnabled(item *Admin) (err error) {
 // DisableAdmin 禁用用户
 func DisableAdmin(adminId int) (err error) {
 	// o := orm.NewOrm()
-	sql := `UPDATE admin
+	sql := `UPDATE "admin"
 			SET
 			  last_updated_time = NOW(),disable_time=now(),enabled=0 WHERE admin_id = ? `
 	//_, err = o.Raw(sql, adminId).Exec()
@@ -221,7 +223,7 @@ type SysuserDeleteReq struct {
 }
 
 func DeleteSysuser(adminId int) (err error) {
-	sql := `DELETE FROM admin WHERE admin_id=? `
+	sql := `DELETE FROM "admin" WHERE admin_id=? `
 	// o := orm.NewOrm()
 	//_, err = o.Raw(sql, adminId).Exec()
 	err = global.DEFAULT_DmSQL.Exec(sql, adminId).Error
@@ -230,7 +232,7 @@ func DeleteSysuser(adminId int) (err error) {
 
 // GetSysAdminCountByMobile 查询系统中是否存在该手机号（如果有传入用户id，那么排除该用户）
 func GetSysAdminCountByMobile(mobile string, adminId int) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM admin WHERE mobile=? `
+	sql := `SELECT COUNT(1) AS count FROM "admin" WHERE mobile=? `
 	if adminId > 0 {
 		sql += ` AND admin_id != ` + fmt.Sprint(adminId)
 	}
@@ -242,7 +244,7 @@ func GetSysAdminCountByMobile(mobile string, adminId int) (count int, err error)
 
 func GetSysUserItems(condition string, pars []interface{}) (items []*AdminItem, err error) {
 	// o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE 1=1 `
+	sql := `SELECT * FROM "admin" WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
@@ -254,7 +256,7 @@ func GetSysUserItems(condition string, pars []interface{}) (items []*AdminItem,
 // GetGroupSysUserList 根据分组id获取系统用户列表
 func GetGroupSysUserList(groupId int) (items []*AdminItem, err error) {
 	// o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE group_id=? ORDER BY created_time DESC `
+	sql := `SELECT * FROM "admin" WHERE group_id=? ORDER BY created_time DESC `
 	//_, err = o.Raw(sql, groupId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, groupId).Find(&items).Error
 	return
@@ -263,7 +265,7 @@ func GetGroupSysUserList(groupId int) (items []*AdminItem, err error) {
 // GetDepartmentGroupSysUserList 根据部门id和分组id获取系统用户列表
 func GetDepartmentGroupSysUserList(departmentId, groupId int, roleTypeCodes string) (items []*AdminItem, err error) {
 	// o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE department_id = ? and group_id=? and enabled=1 `
+	sql := `SELECT * FROM "admin" WHERE department_id = ? and group_id=? and enabled=1 `
 	if roleTypeCodes != "" {
 		sql += ` and role_type_code in (` + roleTypeCodes + `) `
 	}
@@ -276,7 +278,7 @@ func GetDepartmentGroupSysUserList(departmentId, groupId int, roleTypeCodes stri
 // GetGrooupsysUserList 根据大组id和小组id获取系统用户列表
 func GetGrooupsysUserList(groupId int, roleTypeCodes string, enabled int) (items []*AdminItem, err error) {
 	// o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE group_id = ? `
+	sql := `SELECT * FROM "admin" WHERE group_id = ? `
 	if roleTypeCodes != "" {
 		sql += ` and role_type_code in (` + roleTypeCodes + `) `
 	}
@@ -294,7 +296,7 @@ func GetSysAdminByIdSlice(adminIdList []string) (items []*Admin, err error) {
 	if len(adminIdList) <= 0 {
 		return
 	}
-	sql := `SELECT * FROM admin WHERE admin_id in (` + strings.Join(adminIdList, ",") + `) `
+	sql := `SELECT * FROM "admin" WHERE admin_id in (` + strings.Join(adminIdList, ",") + `) `
 	// o := orm.NewOrm()
 	//_, err = o.Raw(sql).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
@@ -304,7 +306,7 @@ func GetSysAdminByIdSlice(adminIdList []string) (items []*Admin, err error) {
 // GetTeamSysUserList 根据小组id获取系统用户列表
 func GetTeamSysUserList(teamId, enabled int) (items []*AdminItem, err error) {
 	// o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE group_id=? `
+	sql := `SELECT * FROM "admin" WHERE group_id=? `
 	if enabled >= 0 {
 		sql += fmt.Sprint(` AND enabled=`, enabled, ` `)
 	}
@@ -324,7 +326,7 @@ func GetGroupIdByParentId(groupId int) (items []*string, err error) {
 
 func GetAdminByGroupId(groupId int) (items []*AdminItem, err error) {
 	// o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE group_id=? ORDER BY created_time DESC`
+	sql := `SELECT * FROM "admin" WHERE group_id=? ORDER BY created_time DESC`
 	//_, err = o.Raw(sql, groupId).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, groupId).Find(&items).Error
 	return
@@ -343,7 +345,7 @@ func GetRaiAdmin() (items []*AdminItem, err error) {
 				real_name,
 				mobile
 			FROM
-				admin
+				"admin"
 			WHERE
 				role_type_code LIKE '%rai%'
 			AND group_id NOT IN (19, 10)
@@ -391,7 +393,7 @@ func GetSysAdminList(condition string, pars []interface{}, fieldArr []string, or
 	if orderRule != "" {
 		order = orderRule
 	}
-	sql := fmt.Sprintf(`SELECT %s FROM admin WHERE 1=1 %s ORDER BY %s`, fields, condition, order)
+	sql := fmt.Sprintf(`SELECT %s FROM "admin" WHERE 1=1 %s ORDER BY %s`, fields, condition, order)
 	// o := orm.NewOrm()
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, pars).Find(&items).Error
@@ -410,7 +412,7 @@ func GetSysAdminByIdList(adminIdList []int) (items []*Admin, err error) {
 	if num <= 0 {
 		return
 	}
-	sql := `SELECT * FROM admin WHERE admin_id in (` + utils.GetOrmInReplace(num) + `) `
+	sql := `SELECT * FROM "admin" WHERE admin_id in (` + utils.GetOrmInReplace(num) + `) `
 	// o := orm.NewOrm()
 	//_, err = o.Raw(sql, adminIdList).QueryRows(&items)
 	err = global.DEFAULT_DmSQL.Raw(sql, adminIdList).Find(&items).Error