no message

controllers/roadshow/company.go

@@ -100,14 +100,8 @@ func (this *CalendarController) CompanyDetail() {
 	}
 	detailView := new(roadshow.CompanyDetailView)
 	if englishCompany == 0 {
-		//if rsReportRecordId > 0 {
-		rsReportRecordItem, err := roadshow.GetRsReportRecordDetailByRsReportRecordId(rsReportRecordId)
-		if err != nil {
-			br.Msg = "路演信息不存在！"
-			br.ErrMsg = "路演信息不存在！Err:" + err.Error()
-			return
-		}
-		//}
+		var companyStatus string
+		var permissionName string
 		companyProductItem, err := company.GetCompanyProductByCompanyIdAndProductId(companyId, productId)
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
@@ -118,23 +112,37 @@ func (this *CalendarController) CompanyDetail() {
 			br.ErrMsg = "搜索客户失败！Err:" + err.Error()
 			return
 		}
-		permissionList, err := company.GetCompanyProductReportPermissionList(companyId, productId)
-		if err != nil {
-			br.Msg = "搜索客户权限失败！"
-			br.ErrMsg = "搜索客户权限失败！Err:" + err.Error()
-			return
-		}
-		var permissionArr []string
-		for _, v := range permissionList {
-			permissionArr = append(permissionArr, v.PermissionName)
+		if rsReportRecordId > 0 {
+			rsReportRecordItem, err := roadshow.GetRsReportRecordDetailByRsReportRecordId(rsReportRecordId)
+			if err != nil {
+				br.Msg = "路演信息不存在！"
+				br.ErrMsg = "路演信息不存在！Err:" + err.Error()
+				return
+			}
+			companyStatus = rsReportRecordItem.CompanyStatus
+			permissionName = rsReportRecordItem.PermissionName
+		} else {
+			permissionList, err := company.GetCompanyProductReportPermissionList(companyId, productId)
+			if err != nil {
+				br.Msg = "搜索客户权限失败！"
+				br.ErrMsg = "搜索客户权限失败！Err:" + err.Error()
+				return
+			}
+			var permissionArr []string
+			for _, v := range permissionList {
+				permissionArr = append(permissionArr, v.PermissionName)
+			}
+			companyStatus = companyProductItem.Status
+			permissionName = strings.Join(permissionArr, "/")
 		}
+
 		detailView.CompanyId = companyProductItem.CompanyId
 		detailView.CompanyName = companyProductItem.CompanyName
-		detailView.Status = rsReportRecordItem.CompanyStatus
+		detailView.Status = companyStatus
 		detailView.IndustryId = companyProductItem.IndustryId
 		detailView.IndustryName = companyProductItem.IndustryName
 		//detailView.PermissionName = strings.Join(permissionArr, "/")
-		detailView.PermissionName = rsReportRecordItem.PermissionName
+		detailView.PermissionName = permissionName
 		detailView.ReportReadTotal = companyProductItem.ViewTotal //ficc报告-累计阅读次数
 
 		if companyType == utils.COMPANY_CLASSIFY_RAI { //权益互动统计

models/system/sys_user.go

@@ -130,6 +130,13 @@ func GetAdminList() (items []*Admin, err error) {
 	return
 }
 
+func GetAdminEnabledList() (items []*Admin, err error) {
+	sql := `SELECT * FROM admin  WHERE  enabled=1  `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
 // GetSysUserByMobile 根据手机号获取管理信息
 //func GetSysUserByMobile(mobile string) (item *Admin, err error) {
 //	sql := `SELECT * FROM admin WHERE mobile = ? LIMIT 1`