From 60271b83bbcfdfaa70cb7d126f60a216e450b635 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 25 Jul 2019 18:15:39 +0800
Subject: [PATCH] =?UTF-8?q?-=20AddStoreCategoryMap=E4=B8=AD=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E9=87=8D=E5=A4=8D=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 95ac12072..008e153bf 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -340,7 +340,7 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
 		WscSyncStatus:  model.SyncFlagNewMask,
 	}
 	storeCat.DeletedAt = utils.DefaultTimeValue
-	if err = GetEntity(db, storeCat, model.FieldStoreID, model.FieldCategoryID, model.FieldDeletedAt); err != nil && err != orm.ErrNoRows {
+	if err = GetEntity(db, storeCat, model.FieldStoreID, model.FieldCategoryID, model.FieldDeletedAt); err != nil && !IsNoRowsError(err) {
 		return err
 	}
 	if vendorID == model.VendorIDMTWM {
@@ -360,7 +360,9 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
 	}
 	if storeCat.ID == 0 {
 		WrapAddIDCULDEntity(storeCat, userName)
-		err = CreateEntity(db, storeCat)
+		if err = CreateEntity(db, storeCat); IsDuplicateError(err) {
+			err = nil
+		}
 	} else {
 		WrapUpdateULEntity(storeCat, userName)
 		_, err = UpdateEntity(db, storeCat)