Merge branch 'master' into develop

master
eason.qian 7 years ago
commit a02ba16a8c

@ -160,13 +160,15 @@ public class NoticeManageImpl implements NoticeManage {
ArrayList<String> mailboxs = new ArrayList<>(); ArrayList<String> mailboxs = new ArrayList<>();
for (String clientMoniker : client_monikers) { for (String clientMoniker : client_monikers) {
JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker); JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
client.put("create_time", date); JSONObject c = new JSONObject();
client.put("notice_id", noticeId); c.put("create_time", date);
noticePartnerMapper.save(client); c.put("notice_id", noticeId);
c.put("client_id", client.getIntValue("client_id"));
noticePartnerMapper.save(c);
String contact_email = client.getString("contact_email"); String contact_email = client.getString("contact_email");
if (contact_email!=null && !mailboxs.contains(contact_email)){ if (contact_email!=null && !mailboxs.contains(contact_email)){
client.put("mailto",contact_email); c.put("mailto",contact_email);
mailto.add(client); mailto.add(c);
mailboxs.add(contact_email); mailboxs.add(contact_email);
} }
} }

Loading…
Cancel
Save