Merge remote-tracking branch 'origin/dm' into dm

models/ppt_v2_grant.go

@@ -144,11 +144,13 @@ func GetAllGrantList(sysUserId int) (list []*PptV2InfoGrantItem, err error) {
 // GetGrantList 获取我共享出去/别人共享给我的的ppt列表
 func GetGrantList(condition string, pars []interface{}) (list []*PptV2InfoGrantItem, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT a.* FROM ppt_v2 a JOIN ppt_v2_grant b on a.ppt_id=b.ppt_id 
+	sql := `SELECT a.ppt_id,a.template_type,a.background_img,a.title,a.report_type,a.ppt_date,a.ppt_url,a.pptx_url,a.content,a.create_time,a.modify_time,
+a.admin_id,a.admin_real_name,a.ppt_version,a.report_id,a.report_code,a.is_share,a.publish_time,a.cover_content,a.ppt_page,a.title_setting FROM ppt_v2 a JOIN ppt_v2_grant b on a.ppt_id=b.ppt_id 
  WHERE 1=1 `
 	sql += condition
 
-	sql += ` GROUP BY a.ppt_id ORDER BY a.modify_time DESC `
+	sql += ` GROUP BY a.ppt_id,a.template_type,a.background_img,a.title,a.report_type,a.ppt_date,a.ppt_url,a.pptx_url,a.content,a.create_time,a.modify_time,
+a.admin_id,a.admin_real_name,a.ppt_version,a.report_id,a.report_code,a.is_share,a.publish_time,a.cover_content,a.ppt_page,a.title_setting ORDER BY a.modify_time DESC `
 	//_, err = o.Raw(sql, pars).QueryRows(&list)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&list).Error
 	return