fix

controllers/home.go

@@ -466,7 +466,7 @@ func (this *MobileHomeController) NewList() {
 	total, err = models.GetResourceDataCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		br.ErrMsg = "获取数据总数失败，Err:" + err.Error()
 		return
 	}
 
@@ -479,7 +479,7 @@ func (this *MobileHomeController) NewList() {
 	list, err := services.GetResourceDataList(condition, pars, startSize, pageSize, user)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		br.ErrMsg = "获取数据列表失败，Err:" + err.Error()
 		return
 	}
 	page = paging.GetPaging(currentIndex, pageSize, total)

models/article.go

@@ -334,13 +334,13 @@ func GetCygxCygxArticleListByCondition(articleTypesCond, activityTypesCond, indu
 	actSql := ` SELECT GROUP_CONCAT(DISTINCT act.activity_id SEPARATOR ',') AS act_ids FROM cygx_activity as act `
 
 	if industryStr != "" {
-		artSql += ` INNER JOIN cygx_industrial_article_group_management  AS iam ON iam.cygx_article_id = art.id 
+		artSql += ` INNER JOIN cygx_industrial_article_group_management  AS iam ON iam.article_id = art.article_id 
 				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=iam.industrial_management_id  `
 		actSql += ` INNER JOIN cygx_industrial_activity_group_management  AS iam ON iam.activity_id = act.activity_id 
 				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=iam.industrial_management_id  `
 	}
 	if subjectNameStr != "" {
-		artSql += ` INNER JOIN cygx_industrial_article_group_subject  AS ias ON ias.cygx_article_id = art.id 
+		artSql += ` INNER JOIN cygx_industrial_article_group_subject  AS ias ON ias.article_id = art.article_id 
 				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=ias.industrial_subject_id  `
 		actSql += ` INNER JOIN cygx_industrial_activity_group_subject  AS ias ON ias.activity_id = act.activity_id 
 				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=ias.industrial_subject_id  `