Roc há 4 meses atrás
pai
commit
168c346805

+ 1 - 1
controllers/base_common.go

@@ -36,7 +36,7 @@ func (c *BaseCommonController) Prepare() {
 	}
 
 	ip := c.Ctx.Input.IP()
-	utils.ApiLog.Info("uri:%s, requestBody:%s, responseBody:%s, ip:%s", c.Ctx.Input.URI(), requestBody, ip)
+	utils.ApiLog.Info("uri:%s, requestBody:%s, ip:%s", c.Ctx.Input.URI(), requestBody, ip)
 }
 
 func (c *BaseCommonController) ServeJSON(encoding ...bool) {

+ 3 - 3
models/system/sys_role_admin.go

@@ -61,7 +61,7 @@ func GetRoleAdminList(condition string, pars []interface{}, startSize, pageSize
 	a.group_name
 FROM
 	sys_role_admin s
-	INNER JOIN admin a ON s.admin_id = a.admin_id 
+	INNER JOIN "admin" a ON s.admin_id = a.admin_id 
 where 1=1`
 	if condition != "" {
 		sql += condition
@@ -80,7 +80,7 @@ func GetRoleAdminListTotal(condition string, pars []interface{}) (total int64, e
 	count(*)
 FROM
 	sys_role_admin s
-	INNER JOIN admin a ON s.admin_id = a.admin_id 
+	INNER JOIN "admin" a ON s.admin_id = a.admin_id 
 where 1=1`
 	if condition != "" {
 		sql += condition
@@ -96,7 +96,7 @@ func CheckRoleAdminByAdminIds(adminIds string, roleId int) (list []*SysRoleAdmin
 	s.*
 FROM
 	sys_role_admin s
-	LEFT JOIN admin a ON s.admin_id = a.admin_id 
+	LEFT JOIN "admin" a ON s.admin_id = a.admin_id 
 where s.role_id=? and s.admin_id in (` + adminIds + `)`
 	//_, err = orm.NewOrm().Raw(sql, roleId).QueryRows(&list)
 	err = global.DEFAULT_DmSQL.Raw(sql, roleId).Find(&list).Error

+ 2 - 2
models/system/sys_user.go

@@ -152,7 +152,7 @@ func GetSysUserByMobile(mobile string) (item *Admin, err error) {
 	sql := `SELECT
 				a.*, b.role_type_code
 			FROM
-				admin AS a
+				"admin" AS a
 			INNER JOIN sys_role AS b ON a.role_id = b.role_id
 			WHERE
 				a.mobile = ?
@@ -166,7 +166,7 @@ func GetSysUserByEmail(email string) (item *Admin, err error) {
 	sql := `SELECT
 				a.*, b.role_type_code
 			FROM
-				admin AS a
+				"admin" AS a
 			INNER JOIN sys_role AS b ON a.role_id = b.role_id
 			WHERE
 				a.email = ?

+ 2 - 2
models/target.go

@@ -540,7 +540,7 @@ type ResearcherListResp struct {
 }
 
 func GetResearcherEntry() (items []*Researcher, err error) {
-	sql := ` SELECT admin_id,admin_name,real_name,mobile,0 as target_count FROM admin WHERE role_type=1 `
+	sql := ` SELECT admin_id,admin_name,real_name,mobile,0 as target_count FROM "admin" WHERE role_type=1 `
 	err = global.DmSQL["edb"].Raw(sql).Find(&items).Error
 	researchLen := len(items)
 	for i := 0; i < researchLen; i++ {
@@ -556,7 +556,7 @@ func GetResearcherEntry() (items []*Researcher, err error) {
 }
 
 func GetResearcherEntryByMobile(mobile string) (items []*Researcher, err error) {
-	sql := ` SELECT admin_id,admin_name,real_name,mobile,0 as target_count FROM admin WHERE  role_type=1 `
+	sql := ` SELECT admin_id,admin_name,real_name,mobile,0 as target_count FROM "admin" WHERE  role_type=1 `
 	if mobile != "" {
 		sql += ` AND mobile IN(` + mobile + `)`
 	}