From 468fb7535805bc9a022363a062a660d14a891e0a Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Mon, 5 Nov 2018 13:53:18 +0800 Subject: [PATCH] =?UTF-8?q?#126=20fix=20save=20=E7=BD=91=E7=AB=99=E6=B8=A0?= =?UTF-8?q?=E9=81=93=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/channel/SNSAccountIMController.java | 2 ++ .../admin/channel/WebIMController.java | 6 +++++- .../admin/config/SystemConfigController.java | 8 +++++++- .../templates/admin/webim/index.html | 12 +++++++++-- .../templates/admin/webim/invote.html | 20 +++++++++++++------ .../templates/admin/webim/profile.html | 18 ++++++++++++----- 6 files changed, 51 insertions(+), 15 deletions(-) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/SNSAccountIMController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/SNSAccountIMController.java index fcb044d3..254218c8 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/SNSAccountIMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/SNSAccountIMController.java @@ -112,6 +112,8 @@ public class SNSAccountIMController extends Handler { coultInvite.setOrgi(super.getOrgi(request)); coultInvite.setName(snsAccount.getName()); coultInvite.setOwner(snsAccount.getCreater()); + coultInvite.setAi(false); + coultInvite.setAifirst(false); invite.save(coultInvite); } } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/WebIMController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/WebIMController.java index cdcef7f5..c5be2b8c 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/WebIMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/WebIMController.java @@ -89,7 +89,11 @@ public class WebIMController extends Handler { @RequestMapping("/save") @Menu(type = "admin", subtype = "app", admin = true) - public ModelAndView save(HttpServletRequest request, @Valid CousultInvite inviteData, @RequestParam(value = "webimlogo", required = false) MultipartFile webimlogo, @RequestParam(value = "agentheadimg", required = false) MultipartFile agentheadimg) throws IOException { + public ModelAndView save(HttpServletRequest request, + @Valid CousultInvite inviteData, + @RequestParam(value = "webimlogo", required = false) MultipartFile webimlogo, + @RequestParam(value = "agentheadimg", required = false) MultipartFile agentheadimg) throws IOException { + if (StringUtils.isNotBlank(inviteData.getSnsaccountid())) { CousultInvite tempData = invite.findBySnsaccountidAndOrgi(inviteData.getSnsaccountid(), super.getOrgi(request)); if (tempData != null) { diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemConfigController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemConfigController.java index a3d0fc49..3a526816 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemConfigController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemConfigController.java @@ -177,7 +177,13 @@ public class SystemConfigController extends Handler { @RequestMapping("/save") @Menu(type = "admin", subtype = "save", admin = true) - public ModelAndView save(ModelMap map, HttpServletRequest request, @Valid SystemConfig config, BindingResult result, @RequestParam(value = "keyfile", required = false) MultipartFile keyfile, @RequestParam(value = "loginlogo", required = false) MultipartFile loginlogo, @RequestParam(value = "consolelogo", required = false) MultipartFile consolelogo, @RequestParam(value = "favlogo", required = false) MultipartFile favlogo, @Valid Secret secret) throws SQLException, IOException, NoSuchAlgorithmException { + public ModelAndView save(ModelMap map, HttpServletRequest request, + @Valid SystemConfig config, BindingResult result, + @RequestParam(value = "keyfile", required = false) MultipartFile keyfile, + @RequestParam(value = "loginlogo", required = false) MultipartFile loginlogo, + @RequestParam(value = "consolelogo", required = false) MultipartFile consolelogo, + @RequestParam(value = "favlogo", required = false) MultipartFile favlogo, + @Valid Secret secret) throws SQLException, IOException, NoSuchAlgorithmException { /*SystemConfig systemConfig = systemConfigRes.findByOrgi(super.getOrgi(request)) ; config.setOrgi(super.getOrgi(request));*/ SystemConfig systemConfig = systemConfigRes.findByOrgi(MainContext.SYSTEM_ORGI); diff --git a/contact-center/app/src/main/resources/templates/admin/webim/index.html b/contact-center/app/src/main/resources/templates/admin/webim/index.html index 8f8d6f8b..231bafd1 100644 --- a/contact-center/app/src/main/resources/templates/admin/webim/index.html +++ b/contact-center/app/src/main/resources/templates/admin/webim/index.html @@ -30,9 +30,17 @@ <#if inviteData??> - + <#if inviteData.ai??> + + <#else> + + + <#if inviteData.aifirst??> + + <#else> + + - diff --git a/contact-center/app/src/main/resources/templates/admin/webim/invote.html b/contact-center/app/src/main/resources/templates/admin/webim/invote.html index 46270ca7..782a718c 100644 --- a/contact-center/app/src/main/resources/templates/admin/webim/invote.html +++ b/contact-center/app/src/main/resources/templates/admin/webim/invote.html @@ -30,12 +30,20 @@ <#if inviteData??> - - - - - - + <#if inviteData.ai??> + + <#else> + + + <#if inviteData.aifirst??> + + <#else> + + + + + +
diff --git a/contact-center/app/src/main/resources/templates/admin/webim/profile.html b/contact-center/app/src/main/resources/templates/admin/webim/profile.html index 90d4e012..820f2f44 100644 --- a/contact-center/app/src/main/resources/templates/admin/webim/profile.html +++ b/contact-center/app/src/main/resources/templates/admin/webim/profile.html @@ -30,11 +30,19 @@ <#if inviteData??> - - - - - + <#if inviteData.ai??> + + <#else> + + + <#if inviteData.aifirst??> + + <#else> + + + + +