|
@@ -7,6 +7,7 @@ import com.alibaba.nacos.shaded.com.google.gson.JsonElement;
|
|
|
import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
|
|
|
import com.alibaba.nacos.shaded.com.google.gson.JsonParser;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.apache.http.client.methods.CloseableHttpResponse;
|
|
|
import org.apache.http.client.methods.HttpGet;
|
|
|
import org.apache.http.client.methods.HttpPost;
|
|
@@ -97,7 +98,6 @@ public class MeetingServiceImpl implements MeetingService {
|
|
|
Object o = getUserInfo(accessToken, "dept_id_list", userID);
|
|
|
List<String> deptIdList = JSON.parseArray(o.toString(), String.class);
|
|
|
String departmentInfo = getDepartmentInfo(accessToken, deptIdList.get(0));
|
|
|
- vo.setStatus(2);
|
|
|
vo.setMeetingTheme(tatil);
|
|
|
vo.setMeetingDept(departmentInfo);
|
|
|
String name = (String)getUserInfo(accessToken, "name", userID);
|
|
@@ -105,7 +105,10 @@ public class MeetingServiceImpl implements MeetingService {
|
|
|
vo.setMeetingTime(formatDateTimeRangeWithFormatter(item.getStartDateTime(),item.getEndDateTime()));
|
|
|
String allUser = getAllUser(onGoingConfIdList.getString(0), accessToken);
|
|
|
vo.setParticipants(allUser);
|
|
|
- break;
|
|
|
+ if(StringUtils.isNotEmpty(allUser)){
|
|
|
+ vo.setStatus(2);
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
//今日预约的会议
|
|
|
MeetingSchedule schedule = new MeetingSchedule();
|
|
@@ -150,12 +153,17 @@ public class MeetingServiceImpl implements MeetingService {
|
|
|
// 获取memberModelMap
|
|
|
JSONArray memberModels = jsonObject.getJSONArray("memberModels");
|
|
|
Set<String> set=new HashSet<>();
|
|
|
- for (int i = 0; i < memberModels.size(); i++) {
|
|
|
- JSONObject memberModel = memberModels.getJSONObject(i);
|
|
|
- String userNick = memberModel.getString("userNick");
|
|
|
- set.add(userNick);
|
|
|
+ if(!memberModels.isEmpty()){
|
|
|
+ for (int i = 0; i < memberModels.size(); i++) {
|
|
|
+ JSONObject memberModel = memberModels.getJSONObject(i);
|
|
|
+ String userNick = memberModel.getString("userNick");
|
|
|
+ set.add(userNick);
|
|
|
+ }
|
|
|
+ return String.join(",",set);
|
|
|
+ }else {
|
|
|
+ return "";
|
|
|
}
|
|
|
- return String.join(",",set);
|
|
|
+
|
|
|
} finally {
|
|
|
response.close();
|
|
|
}
|