Merge branch 'master' into 'KA-26'

# Conflicts:
#   change-log.md

change-log.md

+
 ##KA-26/2021-10-28
 ###在异常拦截器增加错误日志打印
 ```
@@ -5,6 +6,14 @@ package cn.quantgroup.xyqb.aspect.logcaller.LogCallHttpAspect.java 55
 ```
 
 
+##KA-24/2021-10-14
+###修改获取微信信息方法
+```
+package cn.quantgroup.xyqb.service.wechat.impl.WechatServiceImpl;
+function queryByUserId
+2021-10-14 修改 findByUserIdAndAppName 为 findFirstByUserIdAndAppNameOrderByCreatedAtDesc, 原因是存在有多个数据情况
+```
+
 ##KA-20/2021-09-29
 ###极光登陆返回用户是否已注册
 ```

src/main/java/cn/quantgroup/xyqb/repository/IWeChatUserRepository.java

@@ -21,6 +21,8 @@ public interface IWeChatUserRepository extends JpaRepository<WechatUserInfo, Lon
 
     WechatUserInfo findByUserIdAndAppName(Long userId, String appName);
 
+    WechatUserInfo findFirstByUserIdAndAppNameOrderByCreatedAtDesc(Long userId, String appName);
+
     long countByOpenIdAndAppName(String openId, String appName);
 
     /**

src/main/java/cn/quantgroup/xyqb/service/wechat/impl/WechatServiceImpl.java

@@ -221,16 +221,26 @@ public class WechatServiceImpl implements IWechatService {
      *
      * @param userId - 用户标识
      * @return
+     * @TODO 2021-10-14 修改 findByUserIdAndAppName 为 findFirstByUserIdAndAppNameOrderByCreatedAtDesc, 原因是存在有多个数据情况
+     *
      */
     @Override
     public WechatUserInfo queryByUserId(Long userId) {
-        return weChatUserRepository.findByUserIdAndAppName(userId,"xyqb");
+        return weChatUserRepository.findFirstByUserIdAndAppNameOrderByCreatedAtDesc(userId,"xyqb");
     }
+
+    /**
+     *
+     * @param userId
+     * @param appName
+     * @return
+     * @TODO 2021-10-14 修改 findByUserIdAndAppName 为 findFirstByUserIdAndAppNameOrderByCreatedAtDesc, 原因是存在有多个数据情况
+     */
     public WechatUserInfo queryByUserId(Long userId,String appName){
         if(appName==null||"".equals(appName.trim())){
             appName = "xyqb";
         }
-        return weChatUserRepository.findByUserIdAndAppName(userId,appName);
+        return weChatUserRepository.findFirstByUserIdAndAppNameOrderByCreatedAtDesc(userId,appName);
     }