Merge branch 'crm/crm_16.6' into debug

controllers/roadshow/company.go

@@ -104,23 +104,25 @@ func (this *CalendarController) CompanyDetail() {
 		productId = 2
 	}
 
-	ficcSellerMap := make(map[int]int)
-	//raiSellerMap := make(map[int]int)
-	_, groupIdRelationMap, err := services.GetFiccSystemGroup()
-	if err != nil {
-		br.Msg = "获取信息失败！"
-		br.ErrMsg = "获取FICC销售信息失败！Err:" + err.Error()
-		return
-	}
-	ficcSellerList, err := services.GetFiccSeller(time.Now(), groupIdRelationMap)
-	for _, v := range ficcSellerList {
-		ficcSellerMap[v.AdminId] = v.AdminId
-	}
+	if sellerId > 0 {
+		ficcSellerMap := make(map[int]int)
+		//raiSellerMap := make(map[int]int)
+		_, groupIdRelationMap, err := services.GetFiccSystemGroup()
+		if err != nil {
+			br.Msg = "获取信息失败！"
+			br.ErrMsg = "获取FICC销售信息失败！Err:" + err.Error()
+			return
+		}
+		ficcSellerList, err := services.GetFiccSeller(time.Now(), groupIdRelationMap)
+		for _, v := range ficcSellerList {
+			ficcSellerMap[v.AdminId] = v.AdminId
+		}
 
-	if _, ok := ficcSellerMap[sellerId]; ok {
-		productId = 1
-	} else {
-		productId = 2
+		if _, ok := ficcSellerMap[sellerId]; ok {
+			productId = 1
+		} else {
+			productId = 2
+		}
 	}
 
 	detailView := new(roadshow.CompanyDetailView)