no message

controllers/user.go

@@ -218,12 +218,28 @@ func (this *UserController) Detail() {
 			if companyItem != nil && companyItem.CompanyId > 0 {
 				detail.CompanyName = companyItem.CompanyName
 				if companyItem.Status == "试用" || companyItem.Status == "永续" || companyItem.Status == "正式" {
-					permissionStr, err := models.GetCompanyPermission(companyItem.CompanyId)
+					permissionStr, err := models.GetCompanyPermissionByUser(companyItem.CompanyId)
 					if err != nil {
 						br.Msg = "获取信息失败"
 						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 						return
 					}
+					permissionMap := make(map[string]string)
+					permissionStr = "医药(主观),医药(客观),消费(主观),科技(主观),科技(客观),智造(主观),策略,专家,研选"
+					permissionStr = strings.Replace(permissionStr, "主", "", -1)
+					permissionStr = strings.Replace(permissionStr, "客", "", -1)
+					permissionStrList := strings.Split(permissionStr, ",")
+					for _, v := range permissionStrList {
+						fmt.Println(v)
+						if permissionMap[v] == "" {
+							permissionMap[v] = v
+						}
+					}
+					fmt.Println(permissionMap)
+					permissionStr = ""
+					for _, v := range permissionMap {
+						permissionStr = "," + v
+					}
 					detail.PermissionName = permissionStr
 				} else {
 					hasPermission = 1

models/company.go

@@ -89,6 +89,21 @@ func GetCompanyPermission(companyId int) (permission string, err error) {
 	return
 }
 
+func GetCompanyPermissionByUser(companyId int) (permission string, err error) {
+	sql := ` SELECT GROUP_CONCAT(DISTINCT b.remark  ORDER BY b.sort ASC SEPARATOR ',') AS permission
+			FROM company_report_permission AS a
+			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id
+			INNER JOIN company_product AS c ON a.company_id=c.company_id AND a.product_id=c.product_id
+			WHERE  a.company_id=?
+			AND c.is_suspend=0
+            AND b.cygx_auth=1
+			AND c.status IN('正式','试用','永续')
+			AND a.status IN('正式','试用','永续') `
+	o := orm.NewOrm()
+	err = o.Raw(sql, companyId).QueryRow(&permission)
+	return
+}
+
 func GetCompanyPermissionByName(name string) (permission string, err error) {
 	sql := ` SELECT GROUP_CONCAT(DISTINCT b.chart_permission_name  ORDER BY b.sort ASC SEPARATOR '/') AS permission
 			FROM company_report_permission AS a