diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java index 0d5654e..be270f4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java @@ -57,11 +57,5 @@ public class SysCatalogResource extends TenantEntity { */ private Long cover; - /** - * 删除标志(0代表存在 2代表删除) - */ - @TableLogic - private String delFlag; - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogTextbook.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogTextbook.java index b9ef101..b0895db 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogTextbook.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogTextbook.java @@ -52,11 +52,4 @@ public class SysCatalogTextbook extends TenantEntity { */ private Integer type; - /** - * 删除标志(0代表存在 2代表删除) - */ - @TableLogic - private String delFlag; - - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeBanner.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeBanner.java index 3791db8..6bceed6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeBanner.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeBanner.java @@ -57,11 +57,4 @@ public class SysHomeBanner extends TenantEntity { */ private Integer status; - /** - * 删除标志(0代表存在 2代表删除) - */ - @TableLogic - private String delFlag; - - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java index 2a817b1..ccce109 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java @@ -2,7 +2,6 @@ package org.dromara.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -65,11 +64,4 @@ public class SysHomeShow extends TenantEntity { */ private Integer status; - /** - * 删除标志(0代表存在 2代表删除) - */ - @TableLogic - private String delFlag; - - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeTrend.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeTrend.java index 9c0ec11..ea9108c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeTrend.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeTrend.java @@ -57,11 +57,4 @@ public class SysHomeTrend extends TenantEntity { */ private Integer status; - /** - * 删除标志(0代表存在 2代表删除) - */ - @TableLogic - private String delFlag; - - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTeacher.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTeacher.java index 0984f54..15d28dc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTeacher.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTeacher.java @@ -2,7 +2,6 @@ package org.dromara.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -85,12 +84,4 @@ public class SysTeacher extends TenantEntity { * 出生日期 */ private Date birthday; - - /** - * 删除标志(0代表存在 2代表删除) - */ - @TableLogic - private String delFlag; - - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java index 34f5e6f..4a04475 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java @@ -222,7 +222,6 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService @Override public List> buildTreeSelect(SysCatalogResourceBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - lqw.eq(SysCatalogResource::getDelFlag, 0); List voList = baseMapper.selectVoList(lqw); return buildCatalogTreeSelect(voList); } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml index b36acd9..8246968 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StatisticMapper.xml @@ -7,7 +7,6 @@ select count(d.dept_id) from sys_dept d left join sys_dept p on p.dept_id = d.parent_id where p.parent_id = 0 - and d.del_flag = 0 and d.tenant_id = #{tenantId} @@ -19,7 +18,6 @@ left join sys_dept p on d.parent_id = p.dept_id left join sys_dept pp on pp.dept_id = p.parent_id where pp.parent_id = 0 - and d.del_flag = 0 and d.tenant_id = #{tenantId} @@ -28,10 +26,11 @@