Merge branch 'cygx_4.0' of hongze/hongze_cygx into master

controllers/activity.go

@@ -1989,9 +1989,16 @@ func (this *ActivityCoAntroller) AskAdd() {
 		return
 	}
 	resultTime := utils.StrTimeToTime(activityInfo.ActivityTime) //时间字符串格式转时间格式
-	if time.Now().After(resultTime.Add(-time.Minute * 60)) {
-		br.Msg = "活动开始前1小时内无法提交问题"
-		return
+	if activityInfo.ActivityTypeId == 1 && activityInfo.ChartPermissionId != 31 {
+		if time.Now().After(resultTime.Add(-time.Minute * 15)) {
+			br.Msg = "活动开始前15分钟内无法提交问题"
+			return
+		}
+	} else {
+		if time.Now().After(resultTime.Add(-time.Minute * 60)) {
+			br.Msg = "活动开始前1小时内无法提交问题"
+			return
+		}
 	}
 	companyDetail, err := models.GetCompanyDetailById(user.CompanyId)
 	if err != nil {

models/article_department.go

@@ -73,7 +73,7 @@ func GetArticleDepartmentCount(condition string) (count int, err error) {
 func GetCygxArticleDepartmentList(startSize, pageSize int, condition string, uid int) (items []*CygxArticleDepartmentRep, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT d.*,
-		( SELECT COUNT( 1 ) FROM cygx_article AS a INNER JOIN cygx_article_history_record as h ON h.article_id = a.article_id WHERE  a.department_id = d.department_id  AND a.publish_status = 1  AND a.is_report = 1  ) AS art_num,
+		( SELECT COUNT( 1 ) FROM cygx_article AS a INNER JOIN cygx_article_history_record as h ON h.article_id = a.article_id WHERE  a.department_id = d.department_id  AND a.publish_status = 1 ) AS art_num,
 		( SELECT COUNT( 1 ) FROM cygx_article_department_follow AS f  WHERE f.department_id = d.department_id AND f.user_id = ? AND f.type = 1 ) AS follow_num
 		FROM
 		cygx_article_department AS d