主客观都开通时，只显示行业名称

controllers/user.go

@@ -224,21 +224,18 @@ func (this *UserController) Detail() {
 						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
-						}
+					permissionStrOld, err := models.GetCompanyPermission(companyItem.CompanyId)
+					if err != nil {
+						br.Msg = "获取信息失败"
+						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
+						return
 					}
-					fmt.Println(permissionMap)
-					permissionStr = ""
-					for _, v := range permissionMap {
-						permissionStr = "," + v
+					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 {