From 53ea8c8871f6cd839eed2c1bd7cd3546ed0ee112 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 14:50:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?map=E8=BD=ACDTO=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/commons/tools/utils/ConvertUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java index edc8633f02..93c653e178 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java @@ -62,6 +62,9 @@ public class ConvertUtils { } public static T mapToEntity(Map map, Class entity) { + if (null == map){ + return null; + } T t = null; try { t = entity.newInstance(); From a2f3f973172e4436fb49a476cb5eb5672f1e8ad4 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 31 Jul 2020 14:54:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0-=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/PublicUserLoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 44821fcbb7..cece305fd2 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -247,7 +247,7 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { customerId = customerDTO.getId(); } //4-3.token存入redis - Map map3 = (Map)jsonObject.get("PaUserWechatDTO"); + Map map3 = (Map)jsonObject.get("paUserWechatResult"); logger.info("map3的值："+map3); PaUserWechatDTO wechatDTO = ConvertUtils.mapToEntity(map3, PaUserWechatDTO.class); String openid = wechatDTO.getWxOpenId();