根据来源搜索列表

controllers/knowledge/resource.go

@@ -61,6 +61,8 @@ func (this *ResourceController) List() {
 	keyWord := this.GetString("Keyword")
 	resourceType, _ := this.GetInt("ResourceType")
 
+	sourceFrom := this.GetString("SourceFrom")
+
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -97,7 +99,11 @@ func (this *ResourceController) List() {
 				}
 			}
 		}
-
+	}
+	if sourceFrom != "" {
+		sourceArr := strings.Split(sourceFrom, ",")
+		condition += ` AND source_from in (?) `
+		pars = append(pars, sourceArr)
 	}
 	if classifyIds != "" {
 		//转成数组，并把类型转成int

services/knowledge/resource.go

@@ -661,6 +661,23 @@ func getDataByTemplateEvent(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 		tag := strings.TrimSpace(cells[10].Value)          //标签
 
 		if title == "" || content == "" || sourceFrom == "" || classifyName1 == "" { //过滤空白行
+			failDataList = append(failDataList, &knowledge.KnowledgeImportFail{
+				//Id:           0,
+				Title:          title,
+				Content:        content,
+				SourceFrom:     sourceFrom,
+				ClassifyFirst:  classifyName1,
+				ClassifySecond: classifyName2,
+				ClassifyThird:  classifyName3,
+				ResourceType:   resourceType,
+				StartDate:      startDateO,
+				EndDate:        endDateO,
+				StartTime:      startTimeO,
+				EndTime:        endTimeO,
+				Remark:         "标题或正文或来源或分类为空",
+				SysUserId:      strconv.Itoa(sysUserId),
+				CreateTime:     time.Now(),
+			})
 			continue
 		}
 
@@ -899,6 +916,20 @@ func getDataByTemplatePoint(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 		tag := strings.TrimSpace(cells[7].Value)           //标签
 
 		if title == "" || content == "" || sourceFrom == "" || classifyName1 == "" { //过滤空白行
+			failDataList = append(failDataList, &knowledge.KnowledgeImportFail{
+				//Id:           0,
+				Title:          title,
+				Content:        content,
+				SourceFrom:     sourceFrom,
+				ClassifyFirst:  classifyName1,
+				ClassifySecond: classifyName2,
+				ClassifyThird:  classifyName3,
+				ResourceType:   resourceType,
+				StartDate:      startDateO,
+				Remark:         "标题或正文或来源或分类为空",
+				SysUserId:      strconv.Itoa(sysUserId),
+				CreateTime:     time.Now(),
+			})
 			continue
 		}