diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index e28c0bb0e8645a399cd0f5a444b6a4510b1fe586..c997ae9c7164a968dbfd63a7317aa0a0e2d9a192 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -66,15 +66,15 @@ public class GenUtils
             {
                 column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
             }
-            // 如果是整形
-            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
+            // 如果是长整形
+            else if ((str != null && str.length == 1 && Integer.parseInt(str[0]) > 10) || (str == null && column.getColumnType().equals("bigint")))
             {
-                column.setJavaType(GenConstants.TYPE_INTEGER);
+                column.setJavaType(GenConstants.TYPE_LONG);
             }
-            // 长整形
+            // 整形
             else
             {
-                column.setJavaType(GenConstants.TYPE_LONG);
+                column.setJavaType(GenConstants.TYPE_INTEGER);
             }
         }