fixed gitee IGNL9

mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java

@@ -377,7 +377,7 @@ public class ConfigBuilder {
                 tableCommentsSql = String.format(tableCommentsSql, dataSourceConfig.getSchemaname());
             }
             //oracle数据库表太多，出现最大游标错误
-            if (QuerySQL.ORACLE == querySQL) {
+            else if (QuerySQL.ORACLE == querySQL) {
                 if (isInclude) {
                     StringBuilder sb = new StringBuilder(tableCommentsSql);
                     sb.append(" WHERE ").append(querySQL.getTableName()).append(" IN (");

mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/activerecord/Model.java

@@ -94,7 +94,7 @@ public abstract class Model<T extends Model> implements Serializable {
      */
     @Transactional
     public boolean deleteById(Serializable id) {
-        return SqlHelper.retBool(sqlSession().delete(sqlStatement(SqlMethod.DELETE_BY_ID), id));
+        return SqlHelper.delBool(sqlSession().delete(sqlStatement(SqlMethod.DELETE_BY_ID), id));
     }
 
     /**
@@ -137,9 +137,8 @@ public abstract class Model<T extends Model> implements Serializable {
     @Transactional
     public boolean delete(Wrapper wrapper) {
         Map<String, Object> map = new HashMap<>();
-        // delete
         map.put("ew", wrapper);
-        return SqlHelper.retBool(sqlSession().delete(sqlStatement(SqlMethod.DELETE), map));
+        return SqlHelper.delBool(sqlSession().delete(sqlStatement(SqlMethod.DELETE), map));
     }
 
     /**

mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/mapper/SqlHelper.java

@@ -15,8 +15,10 @@
  */
 package com.baomidou.mybatisplus.mapper;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.entity.TableInfo;
+import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.toolkit.*;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.session.Configuration;
@@ -24,14 +26,7 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 
-import com.baomidou.mybatisplus.entity.TableInfo;
-import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.toolkit.GlobalConfigUtils;
-import com.baomidou.mybatisplus.toolkit.MapUtils;
-import com.baomidou.mybatisplus.toolkit.StringUtils;
-import com.baomidou.mybatisplus.toolkit.TableInfoHelper;
+import java.util.List;
 
 /**
  * <p>
@@ -133,6 +128,18 @@ public class SqlHelper {
         return null != result && result >= 1;
     }
 
+    /**
+     * <p>
+     * 删除不存在的逻辑上属于成功
+     * </p>
+     *
+     * @param result 数据库操作返回影响条数
+     * @return boolean
+     */
+    public static boolean delBool(Integer result) {
+        return null != result && result >= 0;
+    }
+
     /**
      * <p>
      * 返回SelectCount执行结果
@@ -214,4 +221,4 @@ public class SqlHelper {
     public static boolean isNotEmptyOfWrapper(Wrapper<?> wrapper) {
         return !isEmptyOfWrapper(wrapper);
     }
-}
+}

mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/service/impl/ServiceImpl.java

@@ -254,7 +254,7 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean deleteById(Serializable id) {
-        return retBool(baseMapper.deleteById(id));
+        return SqlHelper.delBool(baseMapper.deleteById(id));
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -263,19 +263,19 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
         if (MapUtils.isEmpty(columnMap)) {
             throw new MybatisPlusException("deleteByMap columnMap is empty.");
         }
-        return retBool(baseMapper.deleteByMap(columnMap));
+        return SqlHelper.delBool(baseMapper.deleteByMap(columnMap));
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean delete(Wrapper<T> wrapper) {
-        return retBool(baseMapper.delete(wrapper));
+        return SqlHelper.delBool(baseMapper.delete(wrapper));
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean deleteBatchIds(List<? extends Serializable> idList) {
-        return retBool(baseMapper.deleteBatchIds(idList));
+        return SqlHelper.delBool(baseMapper.deleteBatchIds(idList));
     }
 
     @Transactional(rollbackFor = Exception.class)