From 7638ec43874083a502491b0517927f3b7178f72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=92=9A=E5=92=9A?= <2223269838@qq.com>
Date: Wed, 15 Jan 2025 16:18:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20Mp=E5=85=A8=E5=B1=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?,=E6=97=A0=E9=9C=80=E9=92=88=E5=AF=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi-common-mybatis/src/main/resources/common-mybatis.yml | 2 ++
 .../src/main/java/org/dromara/demo/domain/TestDemo.java        | 1 -
 .../src/main/java/org/dromara/demo/domain/TestTree.java        | 1 -
 .../ruoyi-generator/src/main/resources/vm/java/domain.java.vm  | 3 ---
 .../src/main/java/org/dromara/system/domain/SysClient.java     | 1 -
 .../src/main/java/org/dromara/system/domain/SysDept.java       | 1 -
 .../src/main/java/org/dromara/system/domain/SysRole.java       | 1 -
 .../src/main/java/org/dromara/system/domain/SysTenant.java     | 1 -
 .../main/java/org/dromara/system/domain/SysTenantPackage.java  | 1 -
 .../src/main/java/org/dromara/system/domain/SysUser.java       | 1 -
 .../main/java/org/dromara/workflow/domain/FlowCategory.java    | 1 -
 11 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml
index 14662e16a..9b0c33b9e 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml
@@ -24,6 +24,8 @@ mybatis-plus:
       # 主键类型
       # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
       idType: ASSIGN_ID
+      # 逻辑删除字段 (此处配置后, 可不使用@TableLogic注解)
+      logicDeleteField: delFlag
       # 逻辑已删除值(可按需求随意修改)
       logicDeleteValue: 1
       # 逻辑未删除值
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java
index d3af0c963..1ecff1db6 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java
@@ -62,7 +62,6 @@ public class TestDemo extends TenantEntity {
     /**
      * 删除标志
      */
-    @TableLogic
     private Long delFlag;
 
 }
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java
index fd6825386..b3f97c7c9 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java
@@ -59,7 +59,6 @@ public class TestTree extends TenantEntity {
     /**
      * 删除标志
      */
-    @TableLogic
     private Long delFlag;
 
 }
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index 205fb7308..b0b21064f 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -43,9 +43,6 @@ public class ${ClassName} extends ${Entity} {
     /**
      * $column.columnComment
      */
-#if($column.javaField=='delFlag')
-    @TableLogic
-#end
 #if($column.javaField=='version')
     @Version
 #end
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java
index 0f681be08..7a59c5ffd 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java
@@ -70,7 +70,6 @@ public class SysClient extends BaseEntity {
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @TableLogic
     private String delFlag;
 
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java
index 48ca6821b..6cda489b3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java
@@ -72,7 +72,6 @@ public class SysDept extends TenantEntity {
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @TableLogic
     private String delFlag;
 
     /**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java
index 2b4246404..b8dcf8b0a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java
@@ -64,7 +64,6 @@ public class SysRole extends TenantEntity {
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @TableLogic
     private String delFlag;
 
     /**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java
index a564a40c5..3d5336166 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java
@@ -97,7 +97,6 @@ public class SysTenant extends BaseEntity {
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @TableLogic
     private String delFlag;
 
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java
index f7e423f0f..f28f35255 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java
@@ -48,7 +48,6 @@ public class SysTenantPackage extends BaseEntity {
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @TableLogic
     private String delFlag;
 
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java
index 4e603e551..2d64f41fb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java
@@ -85,7 +85,6 @@ public class SysUser extends TenantEntity {
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @TableLogic
     private String delFlag;
 
     /**
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
index 2ec297c5a..c6db7fe28 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
@@ -52,7 +52,6 @@ public class FlowCategory extends TenantEntity {
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @TableLogic
     private String delFlag;
 
 }