fix-bug用户权限展示处理

controllers/user.go

@@ -251,30 +251,33 @@ func (this *UserController) Detail() {
 			}
 			if companyItem != nil && companyItem.CompanyId > 0 {
 				detail.CompanyName = companyItem.CompanyName
-				if companyItem.Status == "试用" || companyItem.Status == "永续" || companyItem.Status == "正式" {
-					permissionStr, err := models.GetCompanyPermissionByUser(companyItem.CompanyId)
-					if err != nil {
-						br.Msg = "获取信息失败"
-						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-						return
-					}
-					permissionStrOld, err := models.GetCompanyPermission(companyItem.CompanyId)
-					if err != nil {
-						br.Msg = "获取信息失败"
-						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-						return
-					}
-					permissionStrListOld := strings.Split(permissionStrOld, ",")
-					for _, v := range permissionStrListOld {
-						if strings.Count(permissionStr, v) > 1 {
-							permissionStr = strings.Replace(permissionStr, v+"(主观)", v, -1)
-							permissionStr = strings.Replace(permissionStr, v+"(客观),", "", -1)
-						}
+				//if companyItem.Status == "试用" || companyItem.Status == "永续" || companyItem.Status == "正式" {
+				permissionStr, err := models.GetCompanyPermissionByUser(companyItem.CompanyId)
+				if err != nil {
+					br.Msg = "获取信息失败"
+					br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
+					return
+				}
+				permissionStrOld, err := models.GetCompanyPermission(companyItem.CompanyId)
+				if err != nil {
+					br.Msg = "获取信息失败"
+					br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
+					return
+				}
+				permissionStrListOld := strings.Split(permissionStrOld, ",")
+				for _, v := range permissionStrListOld {
+					if strings.Count(permissionStr, v) > 1 {
+						permissionStr = strings.Replace(permissionStr, v+"(主观)", v, -1)
+						permissionStr = strings.Replace(permissionStr, v+"(客观),", "", -1)
 					}
-					detail.PermissionName = permissionStr
-				} else {
+				}
+
+				detail.PermissionName = permissionStr
+				//} else {
+				if permissionStr == "" {
 					hasPermission = 1
 				}
+				//}
 				detail.SellerName = companyItem.SellerName
 				detail.SellerMobile = companyItem.Mobile
 			} else {

services/activity.go

@@ -328,7 +328,7 @@ func GetUserType(companyId int) (userType int, permissionStrnew string, err erro
 				err = errs
 				return
 			}
-			permissionStr, errs = models.GetCompanyPermissionByUserNoStatus(companyId)
+			permissionStr, errs = models.GetCompanyPermissionByUser(companyId)
 			if errs != nil {
 				err = errs
 				return