From 56f4266c1785fb149c69a56eeabc0c54ec888c56 Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Tue, 18 Sep 2018 11:04:25 +0800 Subject: [PATCH] =?UTF-8?q?Fixed=20#80=20=E6=9B=B4=E6=94=B9view=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/handler/apps/agent/AgentController.java | 15 +++++++++------ .../apps/service/ChatServiceController.java | 6 +++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/agent/AgentController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/agent/AgentController.java index 8e309408..b895c670 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/agent/AgentController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/agent/AgentController.java @@ -1241,10 +1241,11 @@ public class AgentController extends Handler { if(au == null) throw new CSKefuException("不存在该服务记录"); + User curruser = super.getUser(request); contacts.setId(MainUtils.getUUID()); - contacts.setCreater(super.getUser(request).getId()); - contacts.setOrgi(super.getOrgi(request)); - contacts.setOrgan(super.getUser(request).getOrgan()); + contacts.setCreater(curruser.getId()); + contacts.setOrgi(curruser.getOrgi()); + contacts.setOrgan(curruser.getOrgan()); contacts.setPinyin(PinYinTools.getInstance().getFirstPinYin(contacts.getName())); if(StringUtils.isBlank(contacts.getCusbirthday())) { contacts.setCusbirthday(null); @@ -1260,7 +1261,7 @@ public class AgentController extends Handler { auc.setChannel(au.getChannel()); auc.setCreatetime(new Date()); auc.setAppid(au.getAppid()); - auc.setCreater(super.getUser(request).getId()); + auc.setCreater(curruser.getId()); agentUserContactsRepository.save(auc); return request(super.createRequestPageTempletResponse("redirect:/agent/index.html")); } @@ -1284,10 +1285,12 @@ public class AgentController extends Handler { } } + User curruser = super.getUser(request); + contacts.setCreater(data.getCreater()); contacts.setCreatetime(data.getCreatetime()); - contacts.setOrgi(super.getOrgi(request)); - contacts.setOrgan(super.getUser(request).getOrgan()); + contacts.setOrgi(curruser.getOrgi()); + contacts.setOrgan(curruser.getOrgan()); contacts.setPinyin(PinYinTools.getInstance().getFirstPinYin(contacts.getName())); if(StringUtils.isBlank(contacts.getCusbirthday())) { contacts.setCusbirthday(null); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/service/ChatServiceController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/service/ChatServiceController.java index 5e8497b7..f641c839 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/service/ChatServiceController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/service/ChatServiceController.java @@ -300,7 +300,7 @@ public class ChatServiceController extends Handler { } } map.put("agentUserList", agentUserList) ; - return request(super.createAppsTempletResponse("/apps/service/filter/index")); + return request(super.createAppsTempletResponse("/apps/service/quene/index")); } @RequestMapping("/quene/clean") @@ -314,7 +314,7 @@ public class ChatServiceController extends Handler { CacheHelper.getAgentUserCacheBean().put(agentUser.getUserid(), agentUser, super.getOrgi(request)); AutomaticServiceDist.allotAgent(agentUser, super.getOrgi(request)) ; } - return request(super.createRequestPageTempletResponse("redirect:/service/filter/index.html")); + return request(super.createRequestPageTempletResponse("redirect:/service/quene/index.html")); } @RequestMapping("/quene/invite") @@ -324,7 +324,7 @@ public class ChatServiceController extends Handler { if(agentUser!=null && agentUser.getStatus().equals(MainContext.AgentUserStatusEnum.INQUENE.toString())){ AutomaticServiceDist.allotAgentForInvite(super.getUser(request).getId() , agentUser, super.getOrgi(request)) ; } - return request(super.createRequestPageTempletResponse("redirect:/service/filter/index.html")); + return request(super.createRequestPageTempletResponse("redirect:/service/quene/index.html")); } @RequestMapping("/agent/index")