Merge branch 'cygx_check_table' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/activity.go

@@ -477,7 +477,6 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			cygx_activity AS art
 			INNER JOIN cygx_my_schedule AS my ON my.activity_id = art.activity_id
 			INNER JOIN cygx_activity_type AS t ON t.activity_type_id = art.activity_type_id
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = art.chart_permission_id 
 		WHERE
 			1 = 1 `
 	if condition != `` {
@@ -1017,14 +1016,12 @@ func GetActivityWeekPermission() (permission string, err error) {
 func GetIndustrialActivityGroupManagementList(activityId int) (items []*IndustrialManagementRep, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			p.permission_name,
-			p.chart_permission_id,
+			m.chart_permission_id,
 			m.industrial_management_id,
 			m.industry_name 
 			FROM
 			cygx_industrial_activity_group_management AS am
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = am.industrial_management_id
-			INNER JOIN chart_permission AS p ON p.chart_permission_id = m.chart_permission_id 
 			WHERE
 			am.activity_id = ? AND am.source = 1`
 	_, err = o.Raw(sql, activityId).QueryRows(&items)

models/apply_record.go

@@ -88,6 +88,8 @@ func AddApplyRecord(item *CygxApplyRecord) (err error) {
 	if err != nil {
 		return
 	}
+
+	ow := orm.NewOrmUsingDB("weekly_report")
 	msql := `UPDATE  wx_user
 		SET
 		  note = ?,
@@ -96,7 +98,7 @@ func AddApplyRecord(item *CygxApplyRecord) (err error) {
           real_name=?,
 		  mobile=?
 		WHERE user_id = ? `
-	_, err = o.Raw(msql, item.CompanyName, item.ApplyMethod, item.RealName, item.Mobile, item.UserId).Exec()
+	_, err = ow.Raw(msql, item.CompanyName, item.ApplyMethod, item.RealName, item.Mobile, item.UserId).Exec()
 	return
 }
 

models/article.go

@@ -426,15 +426,6 @@ type ReportArticle struct {
 	Resource         int    `description:"来源类型，1：文章、2：产品内测"`
 }
 
-func GetReportPermission(categoryName string) (item []*ChartPermission, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT b.* FROM cygx_report_mapping AS a
-			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id
-			WHERE a.sub_category_name=? `
-	_, err = o.Raw(sql, categoryName).QueryRows(&item)
-	return
-}
-
 type ReportMappingCategoryRep struct {
 	CategoryId int `description:"文章分类id"`
 }

models/company.go

@@ -180,7 +180,7 @@ func GetCompanyPermissionByName(name string) (permission string, err error) {
 			INNER JOIN company AS cm ON cm.company_id=c.company_id 
 			WHERE  cm.company_name=?
 			AND b.product_id = 2 `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, name).QueryRow(&permission)
 	return
 }

models/industrial_article_group_management.go

@@ -83,14 +83,12 @@ func GetIndustrialArticleGroupManagementList(condition string, pars []interface{
 func GetIndustrialArticleGroupManagementListByArticleId(articleId int) (items []*CygxIndustrialArticleGroupManagement, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			p.permission_name,
-			p.chart_permission_id,
+			m.chart_permission_id,
 			m.industrial_management_id,
 			m.industry_name 
 			FROM
 			cygx_industrial_article_group_management AS am
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = am.industrial_management_id
-			INNER JOIN chart_permission AS p ON p.chart_permission_id = m.chart_permission_id 
 			WHERE
 			am.article_id = ?`
 	_, err = o.Raw(sql, articleId).QueryRows(&items)

models/minutesSummary.go

@@ -82,10 +82,9 @@ func GetMinutesSummarylogListAllV4(articleId int) (items []*ResearchSummaryChart
 // 列表
 func GetMinutesSummarylogListAll(articleId int) (items []*MinutesSummaryChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,c.image_url,l.*
+	sql := `SELECT l.*
 			FROM
 			cygx_minutes_summary_log AS l
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			WHERE l.article_id = ? 
 			GROUP BY l.chart_permission_id
 			ORDER BY l.chart_permission_sort ASC   `

models/user_record.go

@@ -90,17 +90,8 @@ func ModifyUserRecordSessionKey(openId, sessionKey string) (err error) {
 
 // 根据用户id和平台id获取用户关系
 func GetUserRecordByMobile(platform int, bindAccount string) (item *OpenIdList, err error) {
-
 	var sql string
-	if utils.RunMode == "release" {
-		sql = `SELECT cr.open_id,user_id FROM user_record  as u 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE create_platform=? AND bind_account = ?`
-	} else {
-		platform = 1
-		sql = `SELECT open_id,user_id FROM	user_record  WHERE create_platform =? AND bind_account = ?`
-	}
-
+	sql = `SELECT union_id,cygx_user_id AS user_id  FROM	cygx_user_record  WHERE	1 = 1  AND cygx_bind_account = ?`
 	err = orm.NewOrm().Raw(sql, platform, bindAccount).QueryRow(&item)
 	return
 }