Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

controllers/user.go

@@ -345,13 +345,19 @@ func (this *UserController) Detail() {
 					}
 
 					companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
-					if err != nil {
+					if err != nil && err.Error() != utils.ErrNoRow() {
 						br.Msg = "获取信息失败"
 						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 						return
 					}
+					var isSuspend int
+					if companyProduct == nil {
+						isSuspend = 1
+					} else {
+						isSuspend = companyProduct.IsSuspend
+					}
 
-					if len(companyReportPermissionList) == 0 || companyProduct.IsSuspend == 1 {
+					if len(companyReportPermissionList) == 0 || isSuspend == 1 {
 						hasPermission = 1
 					} else {
 						//有研选订阅或研选扣点包任意一项试用权限，即为试用客户,期限显示两项合并之后的最长时间

controllers/yanxuan_special.go

@@ -614,12 +614,14 @@ func (this *YanxuanSpecialController) Collect() {
 	var sellerName string
 	if user.CompanyId > 1 {
 		sellerItemQy, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "查询栏目详情失败！"
 			br.ErrMsg = "获取销售信息失败，Err:" + err.Error()
 			return
 		}
-		sellerName = sellerItemQy.RealName
+		if sellerItemQy != nil {
+			sellerName = sellerItemQy.RealName
+		}
 	}
 
 	if req.Status == 1 {
@@ -797,12 +799,14 @@ func (this *YanxuanSpecialController) Follow() {
 	var sellerName string
 	if user.CompanyId > 1 {
 		sellerItemQy, err := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "查询栏目详情失败！"
 			br.ErrMsg = "获取销售信息失败，Err:" + err.Error()
 			return
 		}
-		sellerName = sellerItemQy.RealName
+		if sellerItemQy != nil {
+			sellerName = sellerItemQy.RealName
+		}
 	}
 	if req.Status == 1 {
 		item := models.CygxYanxuanSpecialFollow{

services/activity.go

@@ -549,6 +549,7 @@ func CheckUserPowerByActivityChoose(user *models.WxUserItem, activityInfo *model
 
 // 根据用户身份处理活动可见
 func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower int) (conditionActivity string, err error) {
+	condition += "  AND  IF ( art.is_limit_people  = 1 ,  art.customer_type_ids != '' ,1=1  )  "
 	//未登录的用户也可以查看所有活动v12.2.1
 	if user.UserId == 0 {
 		conditionActivity = ` AND art.publish_status = 1   AND art.yidong_activity_id = ''  ` + condition