完成

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

@@ -10,7 +10,6 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
 import cn.quantgroup.xyqb.entity.UserDetail;
-import cn.quantgroup.xyqb.model.UserInfo;
 
 /**
  * @author mengfan.feng
@@ -67,13 +66,4 @@ public interface IUserDetailRepository extends JpaRepository<UserDetail, Long>,
     @Query(value = "select * from user_detail where phone_no like ?1 and id_no like ?2", nativeQuery = true)
     List<UserDetail> fuzzyQueryByPhoneNoAndIdNo(String phoneNo, String idNo);
 
-    /**
-     * 按照身份证号和手机号 - 模糊查询
-     * @param phoneNo - 手机号
-     * @param idNo - 身份证号
-     * @return List<UserInfo>
-     */
-    @Query(value = "select u.id as id,u.uuid as uuid,u.phone_no as phone_no,ud.id_no as id_no,ud.name as name,u.registered_from as register_from from user u left join user_detail ud on u.id=ud.user_id where u.phone_no like ?1 and ud.id_no like ?2", nativeQuery = true)
-    List<UserInfo> fuzzyQuery(String phoneNo, String idNo);
-
 }

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

@@ -28,7 +28,6 @@ import cn.quantgroup.xyqb.entity.UserDetail;
 import cn.quantgroup.xyqb.event.StatisticsEvent;
 import cn.quantgroup.xyqb.model.Gender;
 import cn.quantgroup.xyqb.model.IdCardInfo;
-import cn.quantgroup.xyqb.model.UserInfo;
 import cn.quantgroup.xyqb.repository.IUserDetailRepository;
 import cn.quantgroup.xyqb.repository.IUserRepository;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
@@ -226,10 +225,7 @@ public class UserDetailServiceImpl implements IUserDetailService {
 
     @Override
     public List<UserDetail> fuzzyQueryByPhoneNoAndIdNo(String phoneNo, String idNo){
-        List<UserDetail> userDetailList = userDetailRepository.fuzzyQueryByPhoneNoAndIdNo(phoneNo.concat("%"), idNo.concat("%"));
-        log.info("List<UserDetail>:{}", userDetailList);
-        List<UserInfo> userInfoList = userDetailRepository.fuzzyQuery(phoneNo.concat("%"), idNo.concat("%"));
-        log.info("List<UserInfo>:{}", userInfoList);
-        return userDetailList;
+        return userDetailRepository.fuzzyQueryByPhoneNoAndIdNo(phoneNo.concat("%"), idNo.concat("%"));
     }
+
 }