From 07a64ebd6da54fb9481d9bf7e7afce62dce1ff21 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 六月 2020 17:59:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
index fb1737f..4bbbb8a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java
@@ -354,7 +354,7 @@
 		if (robotId == null)
 			throw new UserCloudException(1, "浜戝彂鍗曟満鍣ㄤ汉涓嶅瓨鍦�");
 
-		List<String> list = AitaokerApiUtil.getContract(12793);
+		List<String> list = AitaokerApiUtil.getContract(robotId);
 		if (list == null || list.size() == 0)
 			throw new UserCloudException(1, "鏈绱㈠埌瀵瑰簲缇�");
 
@@ -364,7 +364,7 @@
 			String result = redisManager.getCommonString(key);
 			if (!StringUtil.isNullOrEmpty(result)) {
 				String groupName = null;
-				WeiXinGroupDTO groupDetail = AitaokerApiUtil.getGroupDetail(12793, roomId);
+				WeiXinGroupDTO groupDetail = AitaokerApiUtil.getGroupDetail(robotId, roomId);
 				if (groupDetail != null) {
 					groupName = groupDetail.getGroupName();
 				}

--
Gitblit v1.8.0