fix(微信小程序登录逻辑调整)：返回数据调整

controllers/wechat.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/medivhzhan/weapp/v2"
+	adminResp "hongze/hongze_mobile_admin/models/response/admin"
 	"hongze/hongze_mobile_admin/models/response/wechat"
 	"hongze/hongze_mobile_admin/services"
 	"hongze/hongze_mobile_admin/utils"
@@ -58,12 +59,35 @@ func (this *WeChatCommon) WeChatLogin() {
 		return
 	}
 
+	userInfo := adminResp.LoginResp{
+		RealName:     adminWx.RealName,
+		AdminName:    adminWx.AdminName,
+		RoleName:     adminWx.RoleName,
+		RoleTypeCode: adminWx.RoleTypeCode,
+		AdminId:      adminWx.AdminId,
+	}
+
+	userInfo.AdminId = adminWx.AdminId
+	var productName string
+	productId := services.GetProductId(adminWx.RoleTypeCode)
+
+	if productId == 1 {
+		productName = utils.COMPANY_PRODUCT_FICC_NAME
+	} else if productId == 2 {
+		productName = utils.COMPANY_PRODUCT_RAI_NAME
+	} else {
+		productName = "admin"
+	}
+	userInfo.ProductName = productName
+	userInfo.Authority = adminWx.Authority
+
 	resp := wechat.WxLoginResp{
 		AdminId:       adminWx.AdminId,
 		Code:          0,
 		Authorization: token,
 		Headimgurl:    adminWx.Headimgurl,
 		RealName:      adminWx.RealName,
+		UserInfo:      userInfo,
 	}
 
 	//登录日志
@@ -126,12 +150,35 @@ func (this *WeChatCommon) WxAppLogin() {
 		return
 	}
 
+	userInfo := adminResp.LoginResp{
+		RealName:     adminWx.RealName,
+		AdminName:    adminWx.AdminName,
+		RoleName:     adminWx.RoleName,
+		RoleTypeCode: adminWx.RoleTypeCode,
+		AdminId:      adminWx.AdminId,
+	}
+
+	userInfo.AdminId = adminWx.AdminId
+	var productName string
+	productId := services.GetProductId(adminWx.RoleTypeCode)
+
+	if productId == 1 {
+		productName = utils.COMPANY_PRODUCT_FICC_NAME
+	} else if productId == 2 {
+		productName = utils.COMPANY_PRODUCT_RAI_NAME
+	} else {
+		productName = "admin"
+	}
+	userInfo.ProductName = productName
+	userInfo.Authority = adminWx.Authority
+
 	resp := wechat.WxLoginResp{
 		AdminId:       adminWx.AdminId,
 		Code:          0,
 		Authorization: token,
 		Headimgurl:    adminWx.Headimgurl,
 		RealName:      adminWx.RealName,
+		UserInfo:      userInfo,
 	}
 
 	//登录日志