Merge branch 'gn_2.6_add_ppt_cover_1121@guomengyuan' into debug

models/image_conf.go

@@ -31,7 +31,7 @@ func BatchAddImageMaterials(items []*ImageConf, batchSize int) (err error) {
 func GetImageConfByName(imageName string) (item *ImageConf, err error) {
 	item = &ImageConf{}
 	err = global.DmSQL["rddp"].Where("image_name = ?", imageName).First(item).Error
-	if err.Error() == "record not found" {
+	if err != nil && err.Error() == "record not found" {
 		return nil, nil
 	}
 	return item, nil