|
|
@@ -471,8 +471,10 @@ public class AiHookServiceImpl implements AiHookService {
|
|
|
.body();
|
|
|
R r = com.alibaba.fastjson.JSONObject.parseObject(result, R.class);
|
|
|
String openExternalUserid = r.get("openExternalUserid").toString();
|
|
|
+ log.info("openExternalUserid"+openExternalUserid);
|
|
|
if(StringUtils.isNotBlank(openExternalUserid)){
|
|
|
- qwExternalContacts = qwExternalContactMapper.selectQwExternalByApplicationExternalUserId(openExternalUserid, corpId,user.getQwUserId());
|
|
|
+ qwExternalContacts = qwExternalContactMapper.selectQwExternalContactByExternalUserIdAndQwUserId(openExternalUserid, corpId,user.getQwUserId());
|
|
|
+ log.info("corpId:{},userId:{},查询结果{}",corpId,user.getQwUserId(),qwExternalContacts);
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
@@ -1602,11 +1604,11 @@ public class AiHookServiceImpl implements AiHookService {
|
|
|
String[] split = role.getUserInfo().split(",");
|
|
|
com.alibaba.fastjson.JSONObject userInfo = conversation.getUserInfo();
|
|
|
if(sessionUserInfo != null){
|
|
|
- Map<String,String> map = com.alibaba.fastjson.JSONObject.parseObject(sessionUserInfo, HashMap.class);
|
|
|
+ Map<String,Object> map = com.alibaba.fastjson.JSONObject.parseObject(sessionUserInfo, HashMap.class);
|
|
|
if(role.getUserInfo() != null){
|
|
|
for (String name : split) {
|
|
|
if (name != null) {
|
|
|
- String value = map.get(name);
|
|
|
+ Object value = map.get(name);
|
|
|
if(value != null){
|
|
|
userInfo.put(name,value);
|
|
|
}else{
|
