|
@@ -3,6 +3,7 @@ package user
|
|
|
import (
|
|
|
"errors"
|
|
|
userReq "hongze/hongze_yb/models/request/user"
|
|
|
+ admin2 "hongze/hongze_yb/models/tables/admin"
|
|
|
"hongze/hongze_yb/models/tables/chart_permission"
|
|
|
"hongze/hongze_yb/models/tables/company"
|
|
|
"hongze/hongze_yb/models/tables/company_product"
|
|
@@ -103,6 +104,8 @@ type Detail struct {
|
|
|
RealName string `json:"real_name" description:"用户名称"`
|
|
|
Mobile string `json:"mobile" description:"手机号"`
|
|
|
Email string `json:"email" description:"邮箱"`
|
|
|
+ SellerName string `json:"seal_name" description:"所属销售名称"`
|
|
|
+ SellerMobile string `json:"seal_mobile" description:"所属销售手机号"`
|
|
|
PermissionList []CompanyPermission `json:"permission_list" description:"权限列表"`
|
|
|
}
|
|
|
|
|
@@ -112,6 +115,8 @@ func GetUserInfo(userInfo user.UserInfo) (userDetail Detail, err error, errMsg s
|
|
|
companyName := userInfo.Note
|
|
|
status := ``
|
|
|
var isSuspend int8
|
|
|
+ sellerName := ``
|
|
|
+ sellerMobile := ``
|
|
|
if userInfo.CompanyID > 1 {
|
|
|
companyInfo, tmpErr := company.GetByCompanyId(userInfo.CompanyID)
|
|
|
if tmpErr != nil {
|
|
@@ -131,8 +136,15 @@ func GetUserInfo(userInfo user.UserInfo) (userDetail Detail, err error, errMsg s
|
|
|
//如果有ficc权限,那么就去查询相关权限
|
|
|
if tmpErr == nil {
|
|
|
status = companyProduct.Status //产品状态
|
|
|
- //获取所有的权限分类列表
|
|
|
isSuspend = companyProduct.IsSuspend
|
|
|
+
|
|
|
+ //销售信息
|
|
|
+ sellerName = companyProduct.SellerName
|
|
|
+ adminInfo, tmpErr := admin2.GetByAdminId(companyProduct.SellerID)
|
|
|
+ if tmpErr == nil {
|
|
|
+ sellerMobile = adminInfo.Mobile
|
|
|
+ }
|
|
|
+ //获取所有的权限分类列表
|
|
|
allPermissionList, tmpErr := companyService.GetPermissionListByProductId(1)
|
|
|
if tmpErr != nil {
|
|
|
err = tmpErr
|
|
@@ -187,6 +199,8 @@ func GetUserInfo(userInfo user.UserInfo) (userDetail Detail, err error, errMsg s
|
|
|
RealName: userInfo.RealName,
|
|
|
Mobile: userInfo.Mobile,
|
|
|
Email: userInfo.Email,
|
|
|
+ SellerName: sellerName,
|
|
|
+ SellerMobile: sellerMobile,
|
|
|
PermissionList: list, //权限列表
|
|
|
}
|
|
|
return
|