浏览代码

获取用户详情

rdluck 4 年之前
父节点
当前提交
b498a20329
共有 3 个文件被更改,包括 11 次插入16 次删除
  1. 2 1
      controllers/user.go
  2. 1 1
      models/company.go
  3. 8 14
      models/user.go

+ 2 - 1
controllers/user.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"
 	"hongze/hongze_cygx/utils"
@@ -149,7 +150,7 @@ func (this *UserController) Detail() {
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
 	}
-	companyItem, err := models.GetCompanyDetailById(user.UserId)
+	companyItem, err := models.GetCompanyDetailById(user.CompanyId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取客户信息失败,Err:" + err.Error()

+ 1 - 1
models/company.go

@@ -20,7 +20,7 @@ func GetCompanyDetailById(companyId int) (item *CompanyDetail, err error) {
 }
 
 func GetCompanyPermission(companyId int) (permission string, err error) {
-	sql := ` SELECT GROUP_CONCAT(b.chart_permission_name SEPARATOR ',') AS chart_permission_name
+	sql := ` SELECT GROUP_CONCAT(b.chart_permission_name SEPARATOR ',') AS permission
 			FROM company_report_permission AS a
 			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id
 			WHERE 

+ 8 - 14
models/user.go

@@ -105,21 +105,15 @@ func PcBindMobile(unionId, mobile string, userId, loginType int) (wxUserId int,
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				return
 			}
-			dsql := ` DELETE FROM wx_user WHERE user_id = ? `
-			_, err = o.Raw(dsql, userId).Exec()
-			if err != nil {
-				return user.UserId, err
-			}
-			if user.Mobile == "" && loginType == 1 {
-				msql := ` UPDATE wx_user SET mobile = ?,bind_account = ?  WHERE user_id = ?`
-				_, err = o.Raw(msql, mobile, mobile, user.UserId).Exec()
-				wxUserId = user.UserId
-			}
-			if user.Email == "" && loginType == 2 {
-				msql := ` UPDATE wx_user SET email = ?,bind_account = ?  WHERE user_id = ?`
-				_, err = o.Raw(msql, mobile, mobile, user.UserId).Exec()
-				wxUserId = user.UserId
+			if user.UserId != userId {
+				dsql := ` DELETE FROM wx_user WHERE user_id = ? `
+				_, err = o.Raw(dsql, userId).Exec()
+				if err != nil {
+					return user.UserId, err
+				}
 			}
+			msql := ` UPDATE wx_user SET union_id=?,province=?,city=?,country=?,headimgurl=?,unionid=?,sex=?  WHERE user_id = ?  `
+			_, err = o.Raw(msql, unionId, userInfo.Province, userInfo.City, userInfo.Country, userInfo.Headimgurl, unionId, userInfo.Sex, user.UserId).Exec()
 			utils.FileLog.Info("用户存在,bind:%s,%d,%s", unionId, wxUserId)
 			wxUserId = userId
 		}