Răsfoiți Sursa

fix 登录接口,新增返回所属部门

Roc 3 ani în urmă
părinte
comite
e30a1e22d0
3 a modificat fișierele cu 27 adăugiri și 23 ștergeri
  1. 6 5
      controllers/admin.go
  2. 12 10
      controllers/wechat.go
  3. 9 8
      models/response/admin/admin.go

+ 6 - 5
controllers/admin.go

@@ -50,11 +50,12 @@ func (this *AdminCommon) Login() {
 		return
 	}
 	resp := admin3.LoginResp{
-		RealName:     adminWx.RealName,
-		AdminName:    adminWx.AdminName,
-		RoleName:     adminWx.RoleName,
-		RoleTypeCode: adminWx.RoleTypeCode,
-		AdminId:      adminWx.AdminId,
+		RealName:       adminWx.RealName,
+		AdminName:      adminWx.AdminName,
+		RoleName:       adminWx.RoleName,
+		RoleTypeCode:   adminWx.RoleTypeCode,
+		AdminId:        adminWx.AdminId,
+		DepartmentName: adminWx.DepartmentName,
 	}
 
 	resp.AdminId = adminWx.AdminId

+ 12 - 10
controllers/wechat.go

@@ -60,11 +60,12 @@ func (this *WeChatCommon) WeChatLogin() {
 	}
 
 	userInfo := adminResp.LoginResp{
-		RealName:     adminWx.RealName,
-		AdminName:    adminWx.AdminName,
-		RoleName:     adminWx.RoleName,
-		RoleTypeCode: adminWx.RoleTypeCode,
-		AdminId:      adminWx.AdminId,
+		RealName:       adminWx.RealName,
+		AdminName:      adminWx.AdminName,
+		RoleName:       adminWx.RoleName,
+		RoleTypeCode:   adminWx.RoleTypeCode,
+		AdminId:        adminWx.AdminId,
+		DepartmentName: adminWx.DepartmentName,
 	}
 
 	userInfo.AdminId = adminWx.AdminId
@@ -151,11 +152,12 @@ func (this *WeChatCommon) WxAppLogin() {
 	}
 
 	userInfo := adminResp.LoginResp{
-		RealName:     adminWx.RealName,
-		AdminName:    adminWx.AdminName,
-		RoleName:     adminWx.RoleName,
-		RoleTypeCode: adminWx.RoleTypeCode,
-		AdminId:      adminWx.AdminId,
+		RealName:       adminWx.RealName,
+		AdminName:      adminWx.AdminName,
+		RoleName:       adminWx.RoleName,
+		RoleTypeCode:   adminWx.RoleTypeCode,
+		AdminId:        adminWx.AdminId,
+		DepartmentName: adminWx.DepartmentName,
 	}
 
 	userInfo.AdminId = adminWx.AdminId

+ 9 - 8
models/response/admin/admin.go

@@ -1,12 +1,13 @@
 package admin
 
 type LoginResp struct {
-	AdminName    string `description:"系统用户名称"`
-	RealName     string `description:"系统用户姓名"`
-	Headimgurl   string `description:"用户头像"`
-	RoleName     string `description:"角色名称"`
-	RoleTypeCode string `description:"角色类型编码"`
-	AdminId      int    `description:"系统用户id"`
-	ProductName  string `description:"产品名称:admin,ficc,权益"`
-	Authority    int    `description:"管理权限,0:无,1:部门负责人,2:小组负责人,3:超级管理员"`
+	AdminName      string `description:"系统用户名称"`
+	RealName       string `description:"系统用户姓名"`
+	Headimgurl     string `description:"用户头像"`
+	RoleName       string `description:"角色名称"`
+	RoleTypeCode   string `description:"角色类型编码"`
+	AdminId        int    `description:"系统用户id"`
+	DepartmentName string `description:"所属部门"`
+	ProductName    string `description:"产品名称:admin,ficc,权益"`
+	Authority      int    `description:"管理权限,0:无,1:部门负责人,2:小组负责人,3:超级管理员"`
 }