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