|
|
@@ -646,7 +646,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
requestMap.put("query_word", keyword);
|
|
|
requestMap.put("query_type", 1);
|
|
|
requestMap.put("query_range", 1);
|
|
|
- requestMap.put("limit", 20);
|
|
|
+ requestMap.put("limit", 200);
|
|
|
requestMap.put("cursor", cursor);
|
|
|
HttpEntity<JSONObject> entity = new HttpEntity<>(requestMap, headers);
|
|
|
ResponseEntity<String> ResponseEntity = restTemplate.postForEntity(url, entity, String.class);
|
|
|
@@ -692,7 +692,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", WXCompanyId));
|
|
|
HashMap<String, Object> data = new HashMap<>();
|
|
|
httpRespMsg.data=data;
|
|
|
- data.put("total",0);
|
|
|
//当企业开启了微信通讯录的情况下
|
|
|
if (org.apache.commons.lang3.StringUtils.isNotBlank(keyword) && wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1 && departmentId == -1){
|
|
|
System.out.println("====================开始查询通讯录名单======================");
|
|
|
@@ -700,8 +699,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
List users = result.get("user");
|
|
|
if (users.size()!=0){
|
|
|
List<User> realUser = userMapper.selectList(new QueryWrapper<User>().in("corpwx_userid", users));
|
|
|
+ long total = realUser.size();
|
|
|
data.put("records",realUser);
|
|
|
data.put("nextCursor",result.get("nextCursor").get(0));
|
|
|
+ data.put("total",total);
|
|
|
return httpRespMsg;
|
|
|
}else {
|
|
|
System.err.println("======================user列表没有查询到数据===========================");
|
|
|
@@ -709,6 +710,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
ArrayList<Object> records = new ArrayList<>();
|
|
|
data.put("records",records);
|
|
|
data.put("nextCursor","");
|
|
|
+ data.put("total",0);
|
|
|
return httpRespMsg;
|
|
|
}
|
|
|
}else {
|
cs