Merge remote-tracking branch 'origin/master'

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/tools/WxLoginUserUtil.java

@@ -28,8 +28,7 @@ public class WxLoginUserUtil extends AbstractManager {
         if (accountInfo == null) {
             throw new ManagerException("身份认证信息错误");
         }
-        return customerInfoRepo.findByCustomerIdNumAndCustomerIdTypeAndUserType(accountInfo.getIdNum(),
-                accountInfo.getIdType().getCode(), UserType.PERSONAL_USER.getCode());
+        return customerInfoRepo.findByCustomerIdTypeAndCustomerIdNum(accountInfo.getIdType(),accountInfo.getIdNum());
     }
 
     /**
@@ -61,8 +60,7 @@ public class WxLoginUserUtil extends AbstractManager {
      * 通过AccountInfo获得QtkCustomerInfo信息
      */
     public  QtkCustomerInfo getCustomerInfoFromAccountInfo(AccountInfo accountInfo) throws ManagerException {
-        QtkCustomerInfo customer = customerInfoRepo.findByCustomerIdNumAndCustomerIdTypeAndUserType(accountInfo.getIdNum(),
-                accountInfo.getIdType().getCode(), UserType.PERSONAL_USER.getCode());
+        QtkCustomerInfo customer = customerInfoRepo.findByCustomerIdTypeAndCustomerIdNum(accountInfo.getIdType(),accountInfo.getIdNum());
         if (customer == null) {
             throw new ManagerException("身份认证信息错误");
         }