Ver Fonte

feature: 删除标志改成注解@TableLogic,由mybatis自动处理

luoyb há 1 ano atrás
pai
commit
eebc55b243

+ 4 - 3
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java

@@ -2,6 +2,7 @@ package org.dromara.common.mybatis.core.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
@@ -68,9 +69,9 @@ public class BaseEntity implements Serializable {
     private Map<String, Object> params = new HashMap<>();
 
     /**
-     * 删除标志
+     * 逻辑删除标志0-未删除 2-已删除
      */
-    @TableField(fill = FieldFill.INSERT)
-    private Integer deleteFlag;
+    @TableLogic
+    private String delFlag;
 
 }

+ 3 - 3
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java

@@ -47,9 +47,9 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler {
                             ? baseEntity.getCreateDept() : loginUser.getDeptId());
                     }
                 }
-                if(ObjectUtil.isNull(baseEntity.getDeleteFlag())){
-                    baseEntity.setDeleteFlag(0);
-                }
+//                if(ObjectUtil.isNull(baseEntity.getDeleteFlag())){
+//                    baseEntity.setDeleteFlag(0);
+//                }
             }
         } catch (Exception e) {
             throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java

@@ -72,8 +72,8 @@ public class SysClient extends BaseEntity {
     /**
      * 删除标志(0代表存在 2代表删除)
      */
-    @TableLogic
-    private String delFlag;
+//    @TableLogic
+//    private String delFlag;
 
 
 }

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java

@@ -73,8 +73,8 @@ public class SysDept extends TenantEntity {
     /**
      * 删除标志(0代表存在 2代表删除)
      */
-    @TableLogic
-    private String delFlag;
+//    @TableLogic
+//    private String delFlag;
 
     /**
      * 祖级列表

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java

@@ -64,8 +64,8 @@ public class SysRole extends TenantEntity {
     /**
      * 删除标志(0代表存在 2代表删除)
      */
-    @TableLogic
-    private String delFlag;
+//    @TableLogic
+//    private String delFlag;
 
     /**
      * 备注

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java

@@ -97,7 +97,7 @@ public class SysTenant extends BaseEntity {
     /**
      * 删除标志(0代表存在 2代表删除)
      */
-    @TableLogic
-    private String delFlag;
+//    @TableLogic
+//    private String delFlag;
 
 }

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java

@@ -50,7 +50,7 @@ public class SysTenantPackage extends BaseEntity {
     /**
      * 删除标志(0代表存在 2代表删除)
      */
-    @TableLogic
-    private String delFlag;
+//    @TableLogic
+//    private String delFlag;
 
 }

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java

@@ -85,8 +85,8 @@ public class SysUser extends TenantEntity {
     /**
      * 删除标志(0代表存在 2代表删除)
      */
-    @TableLogic
-    private String delFlag;
+//    @TableLogic
+//    private String delFlag;
 
     /**
      * 最后登录IP