Commit ff99c97d240c05874f52ed7368058a33e926b89c
1 parent
877ba46d07
Exists in
master
update
Showing 1 changed file with 2 additions and 2 deletions
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
View file @
ff99c97
| ... | ... | @@ -692,7 +692,7 @@ |
| 692 | 692 | public void getChatRecord(JSONArray rs,JSONObject jsonObject){ |
| 693 | 693 | JSONArray rsrjson=new JSONArray(); |
| 694 | 694 | //登录账号 |
| 695 | - String user_name=jsonObject.get("user_name").toString(); | |
| 695 | + String user_name=null!=jsonObject.get("user_name")?jsonObject.get("user_name").toString():""; | |
| 696 | 696 | //1 环信管理员 2 医生 3 患者 |
| 697 | 697 | String type=jsonObject.get("type").toString(); |
| 698 | 698 | LymsChatgroup queryChatgroup=new LymsChatgroup(); |
| ... | ... | @@ -741,7 +741,7 @@ |
| 741 | 741 | reusltJsonObject.put("from",lymsChatgroup.getFromp()); |
| 742 | 742 | reusltJsonObject.put("to",lymsChatgroup.getHxgroupid()); |
| 743 | 743 | reusltJsonObject.put("type","groupchat"); |
| 744 | - reusltJsonObject.put("timestamp",lymsMessageList.get(0).getSendtime()); | |
| 744 | + reusltJsonObject.put("timestamp",lymsMessageList.size()>0?lymsMessageList.get(0).getSendtime():null); | |
| 745 | 745 | for (Object r : rs) { |
| 746 | 746 | JSONObject rjson= (JSONObject) JSON.toJSON(r); |
| 747 | 747 | if (! rjson.get("to").toString().equals(lymsChatgroup.getHxgroupid())) { |