|
@@ -84,7 +84,9 @@ func (self *UserController) CheckLogin() {
|
|
|
if merchantUser != nil {
|
|
if merchantUser != nil {
|
|
|
userInfo.MerchantId = merchantUser.MerchantId
|
|
userInfo.MerchantId = merchantUser.MerchantId
|
|
|
}
|
|
}
|
|
|
- userInfo.Rank = wxUser.Rank
|
|
|
|
|
|
|
+ if wxUser != nil {
|
|
|
|
|
+ userInfo.Rank = wxUser.Rank
|
|
|
|
|
+ }
|
|
|
self.Data["json"] = userInfo
|
|
self.Data["json"] = userInfo
|
|
|
self.ServeJSON()
|
|
self.ServeJSON()
|
|
|
}
|
|
}
|