no message

models/company_report_permission.go

@@ -44,3 +44,10 @@ func GetCompanyReportPermissionList(condition string, pars []interface{}) (items
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+func GetCompanyPermissionCheck(companyId, permissionId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
+	sql := `SELECT COUNT(1) AS count FROM company_report_permission AS a WHERE a.company_id=? AND a.chart_permission_id=? `
+	err = o.Raw(sql, companyId, permissionId).QueryRow(&count)
+	return
+}

services/user_permission.go

@@ -131,16 +131,23 @@ func GetUserApplyRecordCountByCompanyIdPay(companyIdPay int) (isCompanyApply boo
 			go utils.SendAlarmMsg(fmt.Sprint("获取客户是否有过历史申请记录 GetUserApplyRecordCountByCompanyIdPay, err：", err.Error()), 2)
 		}
 	}()
-	if companyIdPay >= 1 {
-		return
-	}
+	//if companyIdPay >= 1 {
+	//	return
+	//}
 	// 客户申请
 	applyCount, e := models.GetApplyRecordCountByCompanyIdPay(companyIdPay)
-	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("获取用户申请信息失败, Err: " + e.Error())
+	if e != nil {
+		err = errors.New("GetApplyRecordCountByCompanyIdPay, Err: " + e.Error())
+		return
+	}
+
+	//有研选订阅的权限的也不开放申请按钮
+	permissionCount, e := models.GetCompanyPermissionCheck(companyIdPay, utils.CHART_PERMISSION_ID_YANXUAN)
+	if e != nil {
+		err = errors.New("GetCompanyPermissionCheck, Err: " + e.Error())
 		return
 	}
-	if applyCount > 0 {
+	if applyCount > 0 || permissionCount > 0 {
 		isCompanyApply = true
 	}
 	return