|
@@ -150,24 +150,27 @@ func (this *UserController) Detail() {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
companyItem, err := models.GetCompanyDetailById(user.UserId)
|
|
companyItem, err := models.GetCompanyDetailById(user.UserId)
|
|
- if err != nil {
|
|
|
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
br.Msg = "获取信息失败"
|
|
br.Msg = "获取信息失败"
|
|
br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
|
|
br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- item.CompanyName = companyItem.CompanyName
|
|
|
|
- var hasPermission bool
|
|
|
|
- if companyItem.Status == "试用" || companyItem.Status == "永续" || companyItem.Status == "正式" {
|
|
|
|
- hasPermission = true
|
|
|
|
- permissionStr, err := models.GetCompanyPermission(companyItem.CompanyId)
|
|
|
|
- if err != nil {
|
|
|
|
- br.Msg = "获取信息失败"
|
|
|
|
- br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
|
|
|
|
- return
|
|
|
|
|
|
+ if companyItem != nil {
|
|
|
|
+ item.CompanyName = companyItem.CompanyName
|
|
|
|
+ var hasPermission bool
|
|
|
|
+ if companyItem.Status == "试用" || companyItem.Status == "永续" || companyItem.Status == "正式" {
|
|
|
|
+ hasPermission = true
|
|
|
|
+ permissionStr, err := models.GetCompanyPermission(companyItem.CompanyId)
|
|
|
|
+ if err != nil {
|
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
|
+ br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ item.PermissionName = permissionStr
|
|
}
|
|
}
|
|
- item.PermissionName = permissionStr
|
|
|
|
|
|
+ item.HasPermission = hasPermission
|
|
}
|
|
}
|
|
- item.HasPermission = hasPermission
|
|
|
|
|
|
+
|
|
br.Ret = 200
|
|
br.Ret = 200
|
|
br.Success = true
|
|
br.Success = true
|
|
br.Msg = "获取成功"
|
|
br.Msg = "获取成功"
|