Merge branch 'KA-38' into 'master'

同时判断两个索引

See merge request !32

src/main/java/cn/quantgroup/xyqb/service/user/impl/OauthLoginInfoServiceImpl.java

@@ -50,10 +50,12 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
             String phoneNo = user.getPhoneNo();
             Long userId = user.getId();
             ProductLoginEntity findProductLoginEntity = productLoginRepository.findByInstitutionIdAndProductIdAndExtensionAccountId(institutionId, productId, userId);
+            ProductLoginEntity findProductLoginByPhoneEntity = productLoginRepository.findFirstByInstitutionIdAndProductIdAndPhoneNo(institutionId, productId, phoneNo);
             log.info("=findProductLoginEntity -> {}", JSON.toJSONString(findProductLoginEntity));
+            log.info("=findProductLoginPhoneEntity -> {}", JSON.toJSONString(findProductLoginByPhoneEntity));
             long uuid = 0L;
             // 如果找不到该用户就创建
-            if (findProductLoginEntity == null) {
+            if (findProductLoginEntity == null && findProductLoginByPhoneEntity == null) {
                 // 添加用户到产品登录表
                 long customerId = atomicSequencer.nextId();
 //            long id = session.nextId();