Roc 4 weeks ago
parent
commit
71754073c3
4 changed files with 7 additions and 7 deletions
  1. 1 1
      models/system/sys_menu.go
  2. 3 3
      models/system/sys_user.go
  3. 2 2
      models/target.go
  4. 1 1
      models/variety_tag.go

+ 1 - 1
models/system/sys_menu.go

@@ -61,7 +61,7 @@ type MenuList struct {
 	LevelPath string       `json:"level_path"`
 	Component string       `json:"component"`
 	Hidden    bool         `json:"hidden"`
-	Children  []*ChildMenu `json:"children"`
+	Children  []*ChildMenu `json:"children" gorm:"-"`
 }
 
 type ChildMenu struct {

+ 3 - 3
models/system/sys_user.go

@@ -160,7 +160,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 = ?
@@ -175,7 +175,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 = ?
@@ -190,7 +190,7 @@ func GetSysUserByAdminName(adminName 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.admin_name = ?

+ 2 - 2
models/target.go

@@ -699,7 +699,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 `
 	o := global.DEFAULT_DB
 	err = o.Raw(sql).Find(&items).Error
 	researchLen := len(items)
@@ -725,7 +725,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 + `)`
 	}

+ 1 - 1
models/variety_tag.go

@@ -131,7 +131,7 @@ func GetResearchVarietyTagRelationList(include int) (list []*ResearchVarietyTagR
 				b.real_name AS admin_name
 			FROM
 				research_variety_tag_relation AS a
-			INNER JOIN admin AS b ON a.admin_id = b.admin_id `
+			INNER JOIN "admin" AS b ON a.admin_id = b.admin_id `
 	sql += condition
 	sql += ` ORDER BY
 				a.variety_tag_id ASC,