fix bug

controllers/roadshow/calendar.go

@@ -53,6 +53,8 @@ func (this *CalendarController) CalendarList() {
 	condition += ` AND b.researcher_id=?`
 	pars = append(pars, adminItem.AdminId)
 
+	condition += ` AND a.activity_type IN('路演','公开会议') `
+
 	if status == 1 {
 		condition += ` AND b.status=?`
 		pars = append(pars, 1)
@@ -151,6 +153,7 @@ func (this *CalendarController) Accept() {
 	this.OkDetailed(nil, "保存成功")
 }
 
+
 // @Title 拒绝路演活动接口
 // @Description 拒绝路演活动接口
 // @Param	request	body roadshow.RefuseReq true "type json string"

models/db_init.go

@@ -3,6 +3,7 @@ package models
 import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/rdlucklib/rdluck_tools/orm"
+	"hongze/hongze_mobile_admin/models/roadshow"
 	"hongze/hongze_mobile_admin/models/tables/admin"
 	"hongze/hongze_mobile_admin/models/tables/admin_record"
 	"hongze/hongze_mobile_admin/models/tables/approval_flow"
@@ -82,6 +83,8 @@ func init() {
 		new(wx_user.WxUser),
 		new(seal.Seal), //用印表
 		new(seal.SealOperationRecord),	// 用印操作记录表
+		new(roadshow.RsCalendar),
+		new(roadshow.RsCalendarResearcher),
 	)
 
 }