From fb81e07afe6b992b82f0b3199080391efe6618a5 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Fri, 29 Mar 2024 14:16:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20selectOne=20=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mybatisflex/core/BaseMapper.java | 28 ++++---------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java
index b3519aeb..89534567 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java
@@ -448,13 +448,7 @@ public interface BaseMapper<T> {
      * @return 实体类数据
      */
     default T selectOneByQuery(QueryWrapper queryWrapper) {
-        Long limitRows = CPI.getLimitRows(queryWrapper);
-        try {
-            queryWrapper.limit(1);
-            return MapperUtil.getSelectOneResult(selectListByQuery(queryWrapper));
-        } finally {
-            CPI.setLimitRows(queryWrapper, limitRows);
-        }
+        return MapperUtil.getSelectOneResult(selectListByQuery(queryWrapper));
     }
 
     /**
@@ -465,13 +459,7 @@ public interface BaseMapper<T> {
      * @return 实体类数据
      */
     default <R> R selectOneByQueryAs(QueryWrapper queryWrapper, Class<R> asType) {
-        Long limitRows = CPI.getLimitRows(queryWrapper);
-        try {
-            queryWrapper.limit(1);
-            return MapperUtil.getSelectOneResult(selectListByQueryAs(queryWrapper, asType));
-        } finally {
-            CPI.setLimitRows(queryWrapper, limitRows);
-        }
+        return MapperUtil.getSelectOneResult(selectListByQueryAs(queryWrapper, asType));
     }
 
     /**
@@ -482,7 +470,7 @@ public interface BaseMapper<T> {
      */
     default T selectOneWithRelationsByMap(Map<String, Object> whereConditions) {
         FlexAssert.notEmpty(whereConditions, "whereConditions");
-        return selectOneWithRelationsByQuery(QueryWrapper.create().where(whereConditions));
+        return selectOneWithRelationsByQuery(QueryWrapper.create().where(whereConditions).limit(1L));
     }
 
     /**
@@ -493,7 +481,7 @@ public interface BaseMapper<T> {
      */
     default T selectOneWithRelationsByCondition(QueryCondition whereConditions) {
         FlexAssert.notNull(whereConditions, "whereConditions");
-        return selectOneWithRelationsByQuery(QueryWrapper.create().where(whereConditions));
+        return selectOneWithRelationsByQuery(QueryWrapper.create().where(whereConditions).limit(1L));
     }
 
     /**
@@ -503,13 +491,7 @@ public interface BaseMapper<T> {
      * @return 实体类数据
      */
     default T selectOneWithRelationsByQuery(QueryWrapper queryWrapper) {
-        Long limitRows = CPI.getLimitRows(queryWrapper);
-        try {
-            queryWrapper.limit(1);
-            return MapperUtil.queryRelations(this, MapperUtil.getSelectOneResult(selectListByQuery(queryWrapper)));
-        } finally {
-            CPI.setLimitRows(queryWrapper, limitRows);
-        }
+        return MapperUtil.queryRelations(this, MapperUtil.getSelectOneResult(selectListByQuery(queryWrapper)));
     }
 
     /**