getByProperty查询到多条数据抛异常

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -10,6 +10,7 @@ import org.hibernate.NonUniqueResultException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
+import org.springframework.util.CollectionUtils;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -218,6 +219,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 更新参数汇总方法
+     *
      * @param conditionName  条件属性名
      * @param conditionValue 条件属性值
      * @param propertyName   更新属性名
@@ -478,25 +480,22 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public T getByProperty(DdlPackBean packBean) {
-
-        try {
         List<T> list = findByHqlWhere(packBean);
-            return list.size() != 0 ? list.get(0) : null;
-        }catch(NoResultException ne){
+        if (CollectionUtils.isEmpty(list)) {
             LOGGER.error("数据不存在，DdlPackBean：{}", packBean);
-            return null;
-        }catch(NonUniqueResultException ex){
+            throw new RuntimeException("数据不存在");
+        } else if (list.size() > 1) {
             LOGGER.error("查询单条记录，但出现多条。packBean：{}", packBean);
-            throw new RuntimeException("存在多条记录：" + ex.getMessage());
+            throw new RuntimeException("存在多条记录");
         }
+        return list.iterator().next();
     }
 
     @Override
     public T getByProperty(String propertyName, Object value) {
         String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName;
         try {
-            List<T> list = entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList();
-            return list.size() != 0 ? list.get(0) : null;
+            return (T) entityManager.createQuery(queryString).setParameter(propertyName, value).getSingleResult();
         } catch (NoResultException ne) {
             LOGGER.error("数据不存在，prop：{},value：{}", propertyName, value, ne);
             return null;
@@ -533,8 +532,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
 
         try {
-            List<T> list = queryObject.getResultList();
-            return list.size() != 0 ? list.get(0) : null;
+            return (T) queryObject.getSingleResult();
         } catch (NoResultException ne) {
             LOGGER.error("数据不存在", ne);
             return null;
@@ -1150,6 +1148,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 保存对象
+     *
      * @param item 保存对象
      * @return
      */
@@ -1213,6 +1212,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 对为赋值的属性进行赋值
+     *
      * @param field
      */
     private void fieldSetInitParam(T item, Field field) {
@@ -1268,6 +1268,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 批量弱删除
+     *
      * @return
      */
     @Override
@@ -1290,6 +1291,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 批量弱删除
+     *
      * @return
      */
     @Override
@@ -1328,6 +1330,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 批量禁用
+     *
      * @return
      */
     @Override
@@ -1350,6 +1353,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     /**
      * 批量禁用
+     *
      * @return
      */
     @Override