From a684d6d20b0513a98ee8a0668f0067620827b670 Mon Sep 17 00:00:00 2001
From: guozhong <17853522814@163.com>
Date: Fri, 1 Sep 2023 00:12:28 +0800
Subject: [PATCH] =?UTF-8?q?#794=20=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=82=B9=E5=87=BB=E4=B8=BA=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=B9=E5=90=8E=E7=AB=AF=E8=BF=94=E5=9B=9E=E5=80=BCtags?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91=E8=BF=9B=E8=A1=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E7=9B=AE=E5=89=8D=E4=BF=AE=E6=94=B9=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=B8=BA=EF=BC=9A=E6=9F=A5=E8=AF=A2=E5=90=8C?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E4=B8=8B=EF=BC=8C=E7=B1=BB=E5=9E=8B=E4=B8=BA?=
 =?UTF-8?q?ccsummry=20=E4=B8=8B=E7=9A=84=E6=9C=8D=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: guozhong <17853522814@163.com>
---
 .../com/cskefu/cc/controller/apps/AgentController.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentController.java
index c147685a..7beb6194 100644
--- a/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentController.java
+++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/apps/AgentController.java
@@ -1020,12 +1020,14 @@
                      map.addAttribute("summary", summaries.get(0));
                  }
              }
-             AgentService service = agentServiceRes.findById(agentserviceid).orElse(null);
-             if (service != null) {
+             Organ currentOrgan = super.getOrgan(request);
+             if(null!=currentOrgan){
                  map.addAttribute(
                          "tags", tagRes.findByTagtypeAndSkill(
-                                 MainContext.ModelType.SUMMARY.toString(), service.getSkill()));
+                                 MainContext.ModelType.CCSUMMARY.toString(), currentOrgan.getParent()));
              }
+			 
+			 
              map.addAttribute("userid", userid);
              map.addAttribute("agentserviceid", agentserviceid);
              map.addAttribute("agentuserid", agentuserid);