From b7f2a4dcbaea7628946dd56e86b1c699a9a5a596 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 14 Sep 2022 17:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=AC=E4=BC=97=E5=8F=B7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChannelOaMenuServiceImpl.java | 30 +++++++++---------- .../mdd/front/controller/LoginController.java | 6 ++-- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaMenuServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaMenuServiceImpl.java index 13fb47b0..89331610 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaMenuServiceImpl.java @@ -85,23 +85,21 @@ public class ChannelOaMenuServiceImpl implements IChannelOaMenuService { } for (Map subItem : subButtons) { WxMenuButton subMenuButton = new WxMenuButton(); - if (Integer.parseInt(subItem.get("menuType")) == 1) { - Assert.notNull(subItem.get("visitType"), "子级菜单visitType参数缺失!"); - if (subItem.get("visitType").equals("miniprogram")) { - Assert.notNull(subItem.get("appId"), "子级菜单appId参数缺失!"); - Assert.notNull(subItem.get("url"), "子级菜单url数缺失!"); - Assert.notNull(subItem.get("pagePath"), "子级菜单pagePath数缺失!"); - wxMenuButton.setType(subItem.get("visitType")); - wxMenuButton.setAppId(subItem.get("appId")); - wxMenuButton.setUrl(subItem.get("url")); - wxMenuButton.setPagePath(subItem.get("pagePath")); - } else { - Assert.notNull(subItem.get("url"), "子级菜单url数缺失"); - wxMenuButton.setType(subItem.get("visitType")); - wxMenuButton.setUrl(subItem.get("url")); - } - menuButtons.add(subMenuButton); + Assert.notNull(subItem.get("visitType"), "子级菜单visitType参数缺失!"); + if (subItem.get("visitType").equals("miniprogram")) { + Assert.notNull(subItem.get("appId"), "子级菜单appId参数缺失!"); + Assert.notNull(subItem.get("url"), "子级菜单url数缺失!"); + Assert.notNull(subItem.get("pagePath"), "子级菜单pagePath数缺失!"); + wxMenuButton.setType(subItem.get("visitType")); + wxMenuButton.setAppId(subItem.get("appId")); + wxMenuButton.setUrl(subItem.get("url")); + wxMenuButton.setPagePath(subItem.get("pagePath")); + } else { + Assert.notNull(subItem.get("url"), "子级菜单url数缺失"); + wxMenuButton.setType(subItem.get("visitType")); + wxMenuButton.setUrl(subItem.get("url")); } + menuButtons.add(subMenuButton); } } } diff --git a/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java b/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java index 84a4e515..0a5b22c8 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java @@ -71,9 +71,9 @@ public class LoginController { @GetMapping("/oaLogin") public Object oaLogin(@RequestParam Map params) { - log.error("微信公众号 ==================="); - log.error(JSON.toJSONString(params)); -// iLoginService.officeLogin(params); +// log.error("微信公众号 ==================="); +// log.error(JSON.toJSONString(params)); + iLoginService.officeLogin(params); return AjaxResult.success(); }