Fixed https://github.com/chatopera/cskefu/issues/705 resolve Ads attached by organ

contact-center/app/src/main/java/com/chatopera/cc/controller/admin/channel/SNSAccountIMController.java

@@ -18,6 +18,7 @@ package com.chatopera.cc.controller.admin.channel;
 
 import com.chatopera.cc.basic.MainContext;
 import com.chatopera.cc.basic.MainUtils;
+import com.chatopera.cc.cache.Cache;
 import com.chatopera.cc.controller.Handler;
 import com.chatopera.cc.model.*;
 import com.chatopera.cc.persistence.repository.ConsultInviteRepository;
@@ -65,6 +66,10 @@ public class SNSAccountIMController extends Handler {
     @Autowired
     private OrganRepository organRes;
 
+    @Autowired
+    private Cache cache;
+
+
     @RequestMapping("/index")
     @Menu(type = "admin", subtype = "im", access = false, admin = true)
     public ModelAndView index(ModelMap map, HttpServletRequest request, @Valid String execute, @RequestParam(name = "status", required = false) String status) {
@@ -139,11 +144,17 @@ public class SNSAccountIMController extends Handler {
         if (execute = MainUtils.secConfirm(secRes, super.getOrgi(request), confirm)) {
             SNSAccount snsAccount = snsAccountRes.findByIdAndOrgi(id, super.getOrgi(request));
             if (snsAccountRes != null) {
+                // 删除网站渠道记录
                 snsAccountRes.delete(snsAccount);
+                /**
+                 * 删除网站渠道客服配置
+                 */
                 CousultInvite coultInvite = invite.findBySnsaccountidAndOrgi(snsAccount.getSnsid(), super.getOrgi(request));
                 if (coultInvite != null) {
                     invite.delete(coultInvite);
                 }
+                // 删除缓存
+                cache.deleteConsultInviteBySnsidAndOrgi(snsAccount.getSnsid(), super.getOrgi(request));
             }
         }
 

contact-center/app/src/main/java/com/chatopera/cc/controller/apps/IMController.java

@@ -960,10 +960,28 @@ public class IMController extends Handler {
                 }
                 view.addObject("commentList", Dict.getInstance().getDic(Constants.CSKEFU_SYSTEM_COMMENT_DIC));
                 view.addObject("commentItemList", Dict.getInstance().getDic(Constants.CSKEFU_SYSTEM_COMMENT_ITEM_DIC));
+
+                /**
+                 * 绑定广告位信息，确定对应的组织机构；广告是在该组织机构下，管理的【客服设置】
+                 * 1）查找对应的网站渠道，如果找到对应的网站渠道，则设置为该网站渠道所属的组织机构
+                 * 2）该渠道不属于网站渠道，那么是来自于其他渠道，查看其是否绑定技能组，如果绑定技能组，则使用绑定技能组的 ID
+                 */
+                String adsAttachedOrgan = null;
+                if (StringUtils.isNotEmpty(invite.getSnsaccountid())) {
+                    SNSAccount snsAccount = snsAccountRes.findBySnsidAndOrgi(invite.getSnsaccountid(), orgi);
+                    if (snsAccount != null) {
+                        adsAttachedOrgan = snsAccount.getOrgan();
+                    }
+                } else if (StringUtils.isNotEmpty(skill)) {
+                    adsAttachedOrgan = skill;
+                }
+
+                if (StringUtils.isNotEmpty(adsAttachedOrgan)) {
                     view.addObject("welcomeAd",
-                        MainUtils.getPointAdv(MainContext.AdPosEnum.WELCOME.toString(), skill, orgi));
+                            MainUtils.getPointAdv(MainContext.AdPosEnum.WELCOME.toString(), adsAttachedOrgan, orgi));
                     view.addObject("figureAds",
-                        MainUtils.getPointAdvs(MainContext.AdPosEnum.IMAGE.toString(), skill, orgi));
+                            MainUtils.getPointAdvs(MainContext.AdPosEnum.IMAGE.toString(), adsAttachedOrgan, orgi));
+                }
 
                 // 确定"接受邀请"被处理后，通知浏览器关闭弹出窗口
                 OnlineUserProxy.sendWebIMClients(userid, "accept");

contact-center/app/src/main/resources/templates/apps/setting/agent/index.pug

@@ -29,7 +29,7 @@ block content
                                 .box-header: h3.box-title 对话设置
                                 .box-body.ukefu-im-theme
                                     .row: .col-lg-8
-                                        .ukefu-webim-prop 人工坐席接入欢迎消息（非WEBIM渠道适用）
+                                        .ukefu-webim-prop 人工坐席接入欢迎消息
                                             .ukefu-webim-tl(style="clear:both;")
                                             .box-item: .row: .col-lg-12
                                                 textarea(name="sessionmsg" id="sessionmsg" autocomplete="off" class="layui-input" resize="false" style="height:90px;line-height:22px;resize: none;")= sessionConfig.sessionmsg ? sessionConfig.sessionmsg : "欢迎您来咨询！欢迎使用春松客服！如需帮助请联系 info@chatopera.com"