Merge branch 'KA-38' into 'master'

修改判断用户产品登陆表问题

See merge request !30

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

@@ -10,7 +10,6 @@ import cn.quantgroup.xyqb.service.user.IOauthLoginInfoService;
 import cn.quantgroup.xyqb.util.AtomicSequencer;
 import cn.quantgroup.xyqb.util.RandomSequencer;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,7 +49,7 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
             String productId = oauthClientDetailsEntity.getProductId();
             String phoneNo = user.getPhoneNo();
             Long userId = user.getId();
-            ProductLoginEntity findProductLoginEntity = productLoginRepository.findFirstByInstitutionIdAndProductIdAndPhoneNo(institutionId, productId, phoneNo);
+            ProductLoginEntity findProductLoginEntity = productLoginRepository.findByInstitutionIdAndProductIdAndExtensionAccountId(institutionId, productId, userId);
             log.info("=findProductLoginEntity -> {}", JSON.toJSONString(findProductLoginEntity));
             long uuid = 0L;
             // 如果找不到该用户就创建