no message

controllers/activity.go

@@ -554,7 +554,7 @@ func (this *ActivityCoAntroller) Detail() {
 			hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermissionActivity(user, activityInfo)
 			if err != nil {
 				br.Msg = "获取信息失败"
-				br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
+				br.ErrMsg = "判断是否已申请过试用失败1，Err:" + err.Error()
 				return
 			}
 			resp.Detail = services.ActivityButtonShow(activityInfo)

models/report.go

@@ -1032,7 +1032,7 @@ func GetDepartmentDetail(userId, departmentId int, condition string) (item Depar
 			d.img_url,
 			( SELECT count( 1 ) FROM cygx_article_department_follow AS af WHERE af.user_id = ? AND af.department_id = d.department_id AND af.type= 1 ) AS my_fllow_num,
 			( SELECT count( 1 ) FROM cygx_article_department_follow AS f    WHERE f.department_id = d.department_id  AND f.type= 1 ) AS fllow_num,
-			( SELECT count( 1 ) FROM cygx_article AS a WHERE a.department_id = d.department_id ` + condition + `  ) AS article_num,
+			( SELECT count( 1 ) FROM cygx_article AS a WHERE a.department_id = d.department_id ` + condition + `  AND  a.publish_status = 1  ) AS article_num,
 			( SELECT count( 1 ) FROM cygx_article_collect  AS c    WHERE c.article_id IN (SELECT  article_id FROM cygx_article AS a WHERE a.department_id = d.department_id  ` + condition + ` )) AS collect_num
 		FROM
 			cygx_article_department AS d 

services/company_permission.go

@@ -182,7 +182,7 @@ func GetUserHasPermissionActivity(user *models.WxUserItem, activityInfo *models.
 			} else {
 				popupMsg = "您暂无权限参加此活动，若想参加可以申请开通对应的试用权限"
 			}
-
+			err = nil
 			return
 		} else {
 			return