浏览代码

fix: github 1380

miemie 5 年之前
父节点
当前提交
14985af262

+ 13 - 14
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlRunner.java

@@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.assist.ISqlRunner;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.session.SqlSession;
@@ -85,7 +84,7 @@ public class SqlRunner implements ISqlRunner {
         SqlSession sqlSession = sqlSession();
         try {
             return SqlHelper.retBool(sqlSession.insert(INSERT, sqlMap(sql, args)));
-        }finally {
+        } finally {
             closeSqlSession(sqlSession);
         }
     }
@@ -96,7 +95,7 @@ public class SqlRunner implements ISqlRunner {
         SqlSession sqlSession = sqlSession();
         try {
             return SqlHelper.retBool(sqlSession.delete(DELETE, sqlMap(sql, args)));
-        }finally {
+        } finally {
             closeSqlSession(sqlSession);
         }
     }
@@ -120,7 +119,7 @@ public class SqlRunner implements ISqlRunner {
         SqlSession sqlSession = sqlSession();
         try {
             return SqlHelper.retBool(sqlSession.update(UPDATE, sqlMap(sql, args)));
-        }finally {
+        } finally {
             closeSqlSession(sqlSession);
         }
     }
@@ -137,8 +136,8 @@ public class SqlRunner implements ISqlRunner {
     public List<Map<String, Object>> selectList(String sql, Object... args) {
         SqlSession sqlSession = sqlSession();
         try {
-            return sqlSession().selectList(SELECT_LIST, sqlMap(sql, args));
-        }finally {
+            return sqlSession.selectList(SELECT_LIST, sqlMap(sql, args));
+        } finally {
             closeSqlSession(sqlSession);
         }
     }
@@ -156,7 +155,7 @@ public class SqlRunner implements ISqlRunner {
         SqlSession sqlSession = sqlSession();
         try {
             return sqlSession.selectList(SELECT_OBJS, sqlMap(sql, args));
-        }finally {
+        } finally {
             closeSqlSession(sqlSession);
         }
     }
@@ -179,7 +178,7 @@ public class SqlRunner implements ISqlRunner {
         SqlSession sqlSession = sqlSession();
         try {
             return SqlHelper.retCount(sqlSession.<Integer>selectOne(COUNT, sqlMap(sql, args)));
-        }finally {
+        } finally {
             closeSqlSession(sqlSession);
         }
     }
@@ -196,7 +195,7 @@ public class SqlRunner implements ISqlRunner {
             return null;
         }
         // TODO 待完成
-      //  page.setRecords(sqlSession().selectList(SELECT_LIST, sqlMap(sql, args), page));
+        //  page.setRecords(sqlSession().selectList(SELECT_LIST, sqlMap(sql, args), page));
         return page;
     }
 
@@ -209,16 +208,16 @@ public class SqlRunner implements ISqlRunner {
 
     /**
      * 释放sqlSession
+     *
      * @param sqlSession session
      */
-    private void closeSqlSession(SqlSession sqlSession){
+    private void closeSqlSession(SqlSession sqlSession) {
         SqlSessionFactory sqlSessionFactory;
-        if(clazz!=null){
+        if (clazz != null) {
             sqlSessionFactory = GlobalConfigUtils.currentSessionFactory(clazz);
-        }else {
+        } else {
             sqlSessionFactory = DEFAULT.sqlSessionFactory;
         }
-        SqlSessionUtils.closeSqlSession(sqlSession,sqlSessionFactory);
+        SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
     }
-
 }