Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_4.4

controllers/report.go

@@ -1947,7 +1947,7 @@ func (this *ReportController) IndustryListByDepartmentPc() {
 			articleIdGroup = articleIdSub + "," + articleIdInd
 		} else if articleIdSub != "" && articleIdInd == "" {
 			articleIdGroup = articleIdSub
-		} else if articleIdSub == "" && articleIdInd == "" {
+		} else if articleIdSub == "" && articleIdInd != "" {
 			articleIdGroup = articleIdInd
 		}
 		slice := strings.Split(keyWord, "/")
@@ -1955,7 +1955,7 @@ func (this *ReportController) IndustryListByDepartmentPc() {
 			var subjectIds string
 			for _, v := range slice {
 				subjectId, err := models.GetcygxIndustrialSubjectByName(v)
-				if err != nil {
+				if err != nil && err.Error() != utils.ErrNoRow() {
 					br.Msg = "获取信息失败"
 					br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 					return
@@ -1965,18 +1965,20 @@ func (this *ReportController) IndustryListByDepartmentPc() {
 				}
 			}
 			subjectIds = strings.TrimRight(subjectIds, ",")
-			articleBySub, err := models.GetArticleIdsBySubId(subjectIds)
-			if err != nil {
-				br.Msg = "获取信息失败"
-				br.ErrMsg = "获取文章关联的标的失败,Err:" + err.Error()
-				return
-			}
-			if articleIdGroup != "" {
-				if articleBySub != "" {
-					articleIdGroup += "," + articleBySub
+			if len(subjectIds) > 0 {
+				articleBySub, err := models.GetArticleIdsBySubId(subjectIds)
+				if err != nil {
+					br.Msg = "获取信息失败"
+					br.ErrMsg = "获取文章关联的标的失败,Err:" + err.Error()
+					return
+				}
+				if articleIdGroup != "" {
+					if articleBySub != "" {
+						articleIdGroup += "," + articleBySub
+					}
+				} else {
+					articleIdGroup = articleBySub
 				}
-			} else {
-				articleIdGroup = articleBySub
 			}
 		}
 
@@ -2020,10 +2022,11 @@ func (this *ReportController) IndustryListByDepartmentPc() {
 		}
 		for k2, v2 := range artList {
 			if artList[k2].IsReport == "1" {
-				artList[k2].Title = "【研选观点】" + v2.Title
+				artList[k2].Title = v2.Title
 			} else {
-				artList[k2].Title = "【研选纪要】" + v2.Title
+				artList[k2].Title = v2.Title
 			}
+			artList[k2].IndustryName = strings.Replace(artList[k2].IndustryName, " ", "", -1)
 		}
 		list[k].List = artList
 		if v.FollowNum > 0 {
@@ -2143,10 +2146,11 @@ func (this *ReportController) IndustryAndArticleListPc() {
 				}
 				for k2, v2 := range artList {
 					if artList[k2].IsReport == "1" {
-						artList[k2].Title = "【研选观点】" + v2.Title
+						artList[k2].Title = v2.Title
 					} else {
-						artList[k2].Title = "【研选纪要】" + v2.Title
+						artList[k2].Title = v2.Title
 					}
+					artList[k2].IndustryName = strings.Replace(artList[k2].IndustryName, " ", "", -1)
 				}
 				DepartmentList[k].List = artList
 				if v.FollowNum > 0 {

models/activity_signup.go

@@ -253,7 +253,7 @@ func GetActivitySignupByUserRestrictCount(uid, activityId int) (count int, err e
 
 //获取某一活动已经报名的数量
 func GetActivitySignupSuccessCount(activityId int) (count int, err error) {
-	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_signup WHERE is_cancel=0 AND fail_type = 0 AND activity_id=? `
+	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_signup WHERE is_cancel=0 AND do_fail_type = 0 AND activity_id=? `
 	o := orm.NewOrm()
 	err = o.Raw(sqlCount, activityId).QueryRow(&count)
 	return

models/report.go

@@ -93,6 +93,7 @@ func IndustrialToArticleCategory(industrialManagementId, chartPermissionId int)
 	INNER JOIN cygx_article AS art ON art.category_id = map.category_id
 	INNER JOIN cygx_industrial_article_group_management AS man_g ON man_g.article_id = art.article_id
 	WHERE map.report_type = 2
+	AND map.is_report = 1
     AND art.is_report = 1
     AND art.publish_status = 1
 	AND man_g.industrial_management_id =?