From 54402107ca335c2896fc9c61864f6054ad5bfabb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 16 十二月 2019 16:07:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoRecordServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoRecordServiceImpl.java
index 08a64fd..15dce17 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoRecordServiceImpl.java
@@ -24,7 +24,7 @@
 	
 	@Override
 	@Transactional
-	public void deleteRecord(List<Long> list, Long uid, String device) {
+	public void deleteRecord(List<String> list, Long uid, String device) {
 		if (list == null || list.size() == 0)
 			return;
 		
@@ -35,8 +35,8 @@
 		if (uid != null && uid > 0)
 			device = null;
 		
-		for (long brandId: list) {
-			brandInfoRecordMapper.updateState(brandId, uid, device);
+		for (String brandId: list) {
+			brandInfoRecordMapper.updateState(Long.parseLong(brandId), uid, device);
 		}
 	}
 	

--
Gitblit v1.8.0