|
@@ -211,7 +211,7 @@ public class OrdinaryController {
|
|
for (int i = 0; i < enterUsers.size(); i++) {
|
|
for (int i = 0; i < enterUsers.size(); i++) {
|
|
JSONObject object = enterUsers.getJSONObject(i);
|
|
JSONObject object = enterUsers.getJSONObject(i);
|
|
String uid = object.getString("id");
|
|
String uid = object.getString("id");
|
|
- users.add(userService.findUserById(uid).getFsuid());
|
|
|
|
|
|
+ users.add(uid);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
result.put("users",users);
|
|
result.put("users",users);
|
|
@@ -279,7 +279,7 @@ public class OrdinaryController {
|
|
for (int i = 0; i < enterUsers.size(); i++) {
|
|
for (int i = 0; i < enterUsers.size(); i++) {
|
|
JSONObject object = enterUsers.getJSONObject(i);
|
|
JSONObject object = enterUsers.getJSONObject(i);
|
|
String uid = object.getString("id");
|
|
String uid = object.getString("id");
|
|
- users.add(userService.findUserById(uid).getFsuid());
|
|
|
|
|
|
+ users.add(uid);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
result.put("users",users);
|
|
result.put("users",users);
|
|
@@ -289,10 +289,10 @@ public class OrdinaryController {
|
|
JSONObject head2 = new JSONObject();
|
|
JSONObject head2 = new JSONObject();
|
|
head2.put("title","详情");
|
|
head2.put("title","详情");
|
|
head2.put("url","http://www.fxiaoke.com");
|
|
head2.put("url","http://www.fxiaoke.com");
|
|
- head.put("title","会议参加提醒");
|
|
|
|
|
|
+ head.put("title","会议取消提醒");
|
|
JSONObject first = new JSONObject();
|
|
JSONObject first = new JSONObject();
|
|
- first.put("content","欢迎参加“"+user+"”组织的【"+theme+"】会议," +
|
|
|
|
- "会议将于"+reservationVo.getDate()+" "+reservationVo.getBeginTime()+"-"+reservationVo.getEndTime()+"召开,请届时参见");
|
|
|
|
|
|
+ first.put("content","您好,“"+user+"”组织的【"+theme+"】会议," +
|
|
|
|
+ "会议原定于"+reservationVo.getDate()+" "+reservationVo.getBeginTime()+"-"+reservationVo.getEndTime()+"召开,已经取消,请悉知。");
|
|
message.put("head",head);
|
|
message.put("head",head);
|
|
message.put("first",first);
|
|
message.put("first",first);
|
|
message.put("link",head2);
|
|
message.put("link",head2);
|