From 2904cd6e630b8bf03bec64248c01cda8b756e46f Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Tue, 4 Sep 2018 19:08:00 +0800 Subject: [PATCH] =?UTF-8?q?#46=20=E4=BF=AE=E6=AD=A3=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=B0=8F=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ServiceSummaryRepository.java | 4 +++- .../handler/apps/agent/AgentController.java | 20 +++++++++---------- .../apps/service/OnlineUserController.java | 10 ++++++---- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/service/repository/ServiceSummaryRepository.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/service/repository/ServiceSummaryRepository.java index 1d99191d..c7ac16d2 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/webim/service/repository/ServiceSummaryRepository.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/service/repository/ServiceSummaryRepository.java @@ -23,9 +23,11 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface ServiceSummaryRepository extends JpaRepository{ - public abstract AgentServiceSummary findByAgentserviceidAndOrgi(String agentserviceid , String orgi); + public abstract List findByAgentserviceidAndOrgi(String agentserviceid , String orgi); public abstract AgentServiceSummary findByIdAndOrgi(String id , String orgi) ; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/agent/AgentController.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/agent/AgentController.java index 7bd6d22b..600bedc4 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/agent/AgentController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/agent/AgentController.java @@ -211,9 +211,9 @@ public class AgentController extends Handler { view.addObject("curagentuser", agentUser); view.addObject("inviteData", OnlineUserUtils.cousult(agentUser.getAppid(), agentUser.getOrgi(), inviteRepository)); if(!StringUtils.isBlank(agentUser.getAgentserviceid())){ - AgentServiceSummary summary = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ; - if(summary!=null){ - view.addObject("summary", summary) ; + List summarizes = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ; + if(summarizes.size() > 0){ + view.addObject("summary", summarizes.get(0)) ; } } @@ -344,11 +344,11 @@ public class AgentController extends Handler { agentUserTask.setTokenum(0); agentUserTaskRes.save(agentUserTask) ; } - + if(!StringUtils.isBlank(agentUser.getAgentserviceid())){ - AgentServiceSummary summary = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ; - if(summary!=null){ - view.addObject("summary", summary) ; + List summarizes = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ; + if(summarizes.size() > 0){ + view.addObject("summary", summarizes.get(0)) ; } } @@ -924,9 +924,9 @@ public class AgentController extends Handler { if(!StringUtils.isBlank(userid) && !StringUtils.isBlank(agentuserid)){ AgentUser agentUser = this.agentUserRepository.findByIdAndOrgi(agentuserid, super.getOrgi(request)) ; if(agentUser!=null && !StringUtils.isBlank(agentUser.getAgentserviceid())){ - AgentServiceSummary summary = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ; - if(summary!=null){ - map.addAttribute("summary", summary) ; + List summaries = this.serviceSummaryRes.findByAgentserviceidAndOrgi(agentUser.getAgentserviceid(), super.getOrgi(request)) ; + if(summaries.size() > 0){ + map.addAttribute("summary", summaries.get(0)) ; } } map.addAttribute("tags", tagRes.findByOrgiAndTagtype(super.getOrgi(request) , UKDataContext.ModelType.SUMMARY.toString())) ; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/service/OnlineUserController.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/service/OnlineUserController.java index 1019a4db..abf4c8d6 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/service/OnlineUserController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/service/OnlineUserController.java @@ -121,8 +121,9 @@ public class OnlineUserController extends Handler { } if(agentService!=null){ - AgentServiceSummary summary = serviceSummaryRes.findByAgentserviceidAndOrgi(agentService.getId(), super.getOrgi(request)) ; - map.put("summary" , summary) ; + List summaries = serviceSummaryRes.findByAgentserviceidAndOrgi(agentService.getId(), super.getOrgi(request)) ; + if(summaries.size() > 0) + map.put("summary" , summaries.get(0)) ; } List agentUserContactsList = agentUserContactsRes.findByUseridAndOrgi(userid, super.getOrgi(request)) ; @@ -172,8 +173,9 @@ public class OnlineUserController extends Handler { map.put("summaryTags", tagRes.findByOrgiAndTagtype(super.getOrgi(request) , UKDataContext.ModelType.SUMMARY.toString())) ; if(agentService!=null){ - AgentServiceSummary summary = serviceSummaryRes.findByAgentserviceidAndOrgi(agentService.getId(), super.getOrgi(request)) ; - map.put("summary" , summary) ; + List summaries = serviceSummaryRes.findByAgentserviceidAndOrgi(agentService.getId(), super.getOrgi(request)) ; + if(summaries.size() > 0) + map.put("summary" , summaries.get(0)) ; } map.put("agentUserMessageList", chatMessageRepository.findByAgentserviceidAndOrgi(agentService.getId() , super.getOrgi(request), new PageRequest(0, 50, Direction.DESC , "updatetime")));