|
|
@@ -398,7 +398,6 @@ func (this *RaiServeCoAntroller) List() {
|
|
|
parsBill = append(parsBill, serveTypeId)
|
|
|
}
|
|
|
|
|
|
- fmt.Println(conditionBill)
|
|
|
conditionBill += " AND company_id IN (" + utils.GetOrmInReplace(lencompanyIds) + ") "
|
|
|
parsBill = append(parsBill, companyIds)
|
|
|
|
|
|
@@ -732,7 +731,7 @@ func getServeBillTag(tagType, tagId int) (conditionBill string, parsBill []inter
|
|
|
parsBill = append(parsBill, rsCalendarIds)
|
|
|
//}
|
|
|
|
|
|
- conditionBill += ` AND source != 'yanxuanspecial' `
|
|
|
+ conditionBill += ` AND source != 'yanxuanspecial' AND source != 'userfeedback' `
|
|
|
return
|
|
|
}
|
|
|
|
xingzai