报告标签筛选

controllers/message.go

@@ -72,9 +72,9 @@ func (this *MessageController) ReportList() {
 		}
 		classifyCondition := " AND COALESCE(NULLIF(classify_id_third,0),NULLIF(classify_id_second,0),classify_id_first) in (" + utils.GetOrmReplaceHolder(len(classifyIds)) + ")"
 		classifyPars = append(classifyPars, classifyIds)
-		var ids []int
+		var orgIds []int
 		// eta
-		ids, _ = models.GetETAReportIdsByCondition(classifyCondition, classifyPars)
+		orgIds, _ = models.GetETAReportIdsByCondition(classifyCondition, classifyPars)
 		if err != nil {
 			br.Msg = "获取报告列表失败"
 			br.ErrMsg = "获取报告表ids失败，Err:" + err.Error()
@@ -87,17 +87,17 @@ func (this *MessageController) ReportList() {
 			br.ErrMsg = "获取品种名称失败，Err:" + err.Error()
 			return
 		}
-		if len(ids) == 0 && len(names) == 0 {
+		if len(orgIds) == 0 && len(names) == 0 {
 			condition += ""
-		} else if len(ids) == 0 {
+		} else if len(orgIds) == 0 {
 			condition += "And (plate_name in (" + utils.GetOrmReplaceHolder(len(names)) + ") And source ='HT')"
 			pars = append(pars, names)
 		} else if len(names) == 0 {
-			condition += "AND  ( id in (" + utils.GetOrmReplaceHolder(len(ids)) + ")  And source ='ETA') "
-			pars = append(pars, ids)
+			condition += "AND  ( org_id in (" + utils.GetOrmReplaceHolder(len(orgIds)) + ")  And source ='ETA') "
+			pars = append(pars, orgIds)
 		} else {
-			condition += "AND ( (id in (" + utils.GetOrmReplaceHolder(len(ids)) + ")  And source ='ETA') or (plate_name in (" + utils.GetOrmReplaceHolder(len(names)) + ") And source ='HT'))"
-			pars = append(pars, ids)
+			condition += "AND ( (orgIds in (" + utils.GetOrmReplaceHolder(len(orgIds)) + ")  And source ='ETA') or (plate_name in (" + utils.GetOrmReplaceHolder(len(names)) + ") And source ='HT'))"
+			pars = append(pars, orgIds)
 			pars = append(pars, names)
 		}
 	}