github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

Fixed #80 更改view名

Browse Source
This commit is contained in:
Hai Liang Wang 2018-09-18 11:04:25 +08:00
parent 40e7bf0f0f
commit 56f4266c17
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/agent/AgentController.java
View File

@ -1241,10 +1241,11 @@ public class AgentController extends Handler {
if(au == null) if(au == null)
throw new CSKefuException("不存在该服务记录"); throw new CSKefuException("不存在该服务记录");
User curruser = super.getUser(request);
contacts.setId(MainUtils.getUUID()); contacts.setId(MainUtils.getUUID());
contacts.setCreater(super.getUser(request).getId()); contacts.setCreater(curruser.getId());
contacts.setOrgi(super.getOrgi(request)); contacts.setOrgi(curruser.getOrgi());
contacts.setOrgan(super.getUser(request).getOrgan()); contacts.setOrgan(curruser.getOrgan());
contacts.setPinyin(PinYinTools.getInstance().getFirstPinYin(contacts.getName())); contacts.setPinyin(PinYinTools.getInstance().getFirstPinYin(contacts.getName()));
if(StringUtils.isBlank(contacts.getCusbirthday())) { if(StringUtils.isBlank(contacts.getCusbirthday())) {
contacts.setCusbirthday(null); contacts.setCusbirthday(null);
@ -1260,7 +1261,7 @@ public class AgentController extends Handler {
auc.setChannel(au.getChannel()); auc.setChannel(au.getChannel());
auc.setCreatetime(new Date()); auc.setCreatetime(new Date());
auc.setAppid(au.getAppid()); auc.setAppid(au.getAppid());
auc.setCreater(super.getUser(request).getId()); auc.setCreater(curruser.getId());
agentUserContactsRepository.save(auc); agentUserContactsRepository.save(auc);
return request(super.createRequestPageTempletResponse("redirect:/agent/index.html")); 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.setCreater(data.getCreater());
contacts.setCreatetime(data.getCreatetime()); contacts.setCreatetime(data.getCreatetime());
contacts.setOrgi(super.getOrgi(request)); contacts.setOrgi(curruser.getOrgi());
contacts.setOrgan(super.getUser(request).getOrgan()); contacts.setOrgan(curruser.getOrgan());
contacts.setPinyin(PinYinTools.getInstance().getFirstPinYin(contacts.getName())); contacts.setPinyin(PinYinTools.getInstance().getFirstPinYin(contacts.getName()));
if(StringUtils.isBlank(contacts.getCusbirthday())) { if(StringUtils.isBlank(contacts.getCusbirthday())) {
contacts.setCusbirthday(null); contacts.setCusbirthday(null);

6
contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/service/ChatServiceController.java
View File

@ -300,7 +300,7 @@ public class ChatServiceController extends Handler {
} }
} }
map.put("agentUserList", agentUserList) ; map.put("agentUserList", agentUserList) ;
return request(super.createAppsTempletResponse("/apps/service/filter/index")); return request(super.createAppsTempletResponse("/apps/service/quene/index"));
} }
@RequestMapping("/quene/clean") @RequestMapping("/quene/clean")
@ -314,7 +314,7 @@ public class ChatServiceController extends Handler {
CacheHelper.getAgentUserCacheBean().put(agentUser.getUserid(), agentUser, super.getOrgi(request)); CacheHelper.getAgentUserCacheBean().put(agentUser.getUserid(), agentUser, super.getOrgi(request));
AutomaticServiceDist.allotAgent(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") @RequestMapping("/quene/invite")
@ -324,7 +324,7 @@ public class ChatServiceController extends Handler {
if(agentUser!=null && agentUser.getStatus().equals(MainContext.AgentUserStatusEnum.INQUENE.toString())){ if(agentUser!=null && agentUser.getStatus().equals(MainContext.AgentUserStatusEnum.INQUENE.toString())){
AutomaticServiceDist.allotAgentForInvite(super.getUser(request).getId() , agentUser, super.getOrgi(request)) ; 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") @RequestMapping("/agent/index")