浏览代码

Merge branch 'CRM6.2' into debug

longyu 3 年之前
父节点
当前提交
681a566c1c
共有 1 个文件被更改,包括 0 次插入4 次删除
  1. 0 4
      controllers/roadshow/calendar.go

+ 0 - 4
controllers/roadshow/calendar.go

@@ -358,10 +358,6 @@ func (this *CalendarController) CalendarTypeList() {
 	var condition string
 	var pars []interface{}
 
-	condition += ` AND b.researcher_id=?`
-	pars = append(pars, adminItem.AdminId)
-
-
 	if calendarType == 1 {
 		condition += ` AND a.activity_type='内部会议' `
 		condition += ` AND a.sys_user_id=?`