Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

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<String,Object> map3 = (Map)jsonObject.get("PaUserWechatDTO");
+        Map<String,Object> map3 = (Map)jsonObject.get("paUserWechatResult");
         logger.info("map3的值："+map3);
         PaUserWechatDTO wechatDTO = ConvertUtils.mapToEntity(map3, PaUserWechatDTO.class);
         String openid = wechatDTO.getWxOpenId();

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> T mapToEntity(Map<String, Object> map, Class<T> entity) {
+        if (null == map){
+            return null;
+        }
         T t = null;
         try {
             t = entity.newInstance();