From 1f0db72effe89280001306a0d95ae78ed0dd4db0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 15 三月 2026 17:47:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/web/BaseController.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 46c2845..31ec0c9 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -1,5 +1,6 @@
 package com.zy.common.web;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.core.common.BaseRes;
@@ -69,14 +70,11 @@
                     || Modifier.isTransient(field.getModifiers())){
                 continue;
             }
-            String column = null;
-            if (field.isAnnotationPresent(TableField.class)) {
-                column = field.getAnnotation(TableField.class).value();
-            }
+            String column = resolveColumn(field);
             if (Cools.isEmpty(column)) {
-                column = field.getName();
+                continue;
             }
-            if (!set.contains(column)) {
+            if (!set.contains(column) && !set.contains(field.getName())) {
                 columns.add(column);
             }
         }
@@ -92,4 +90,21 @@
             }
         });
     }
+
+    private String resolveColumn(Field field) {
+        String column = null;
+        if (field.isAnnotationPresent(TableField.class)) {
+            TableField tableField = field.getAnnotation(TableField.class);
+            if (!tableField.exist()) {
+                return null;
+            }
+            column = tableField.value();
+        } else if (field.isAnnotationPresent(TableId.class)) {
+            column = field.getAnnotation(TableId.class).value();
+        }
+        if (Cools.isEmpty(column)) {
+            column = humpToLine(field.getName());
+        }
+        return column;
+    }
 }

--
Gitblit v1.9.1