修复bug

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/dal/mysql/business/AttendanceBusinessMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.business.AttendanceBusinessDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.attendance.controller.admin.business.vo.*;
 
@@ -44,6 +45,7 @@ public interface AttendanceBusinessMapper extends BaseMapperX<AttendanceBusiness
                 .likeIfPresent(AttendanceBusinessDO::getCreatorEmployeeName, reqVO.getCreatorEmployeeName())
                 .betweenIfPresent(AttendanceBusinessDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AttendanceBusinessDO::getTenantId, reqVO.getTenantId())
+                .eq(AttendanceBusinessDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(AttendanceBusinessDO::getId));
     }
 

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/dal/mysql/employeesetting/AttendanceEmployeeSettingMapper.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.attendance.controller.admin.employeesetting.vo.At
 import cn.iocoder.yudao.module.attendance.dal.dataobject.business.AttendanceBusinessDO;
 import cn.iocoder.yudao.module.attendance.controller.admin.employeesetting.vo.AttendanceEmployeeSettingRespVO;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.employeesetting.AttendanceEmployeeSettingDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -32,6 +33,7 @@ public interface AttendanceEmployeeSettingMapper extends BaseMapperX<AttendanceE
                 .eqIfPresent(AttendanceEmployeeSettingDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AttendanceEmployeeSettingDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AttendanceEmployeeSettingDO::getTenantId, reqVO.getTenantId())
+                .eq(AttendanceEmployeeSettingDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(AttendanceEmployeeSettingDO::getId));
     }
 

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/dal/mysql/info/AttendanceInfoMapper.java

@@ -6,7 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.attendance.controller.admin.info.vo.*;
+import cn.iocoder.yudao.module.attendance.dal.dataobject.employeesetting.AttendanceEmployeeSettingDO;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.info.AttendanceInfoDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -40,6 +42,7 @@ public interface AttendanceInfoMapper extends BaseMapperX<AttendanceInfoDO> {
                 .eqIfPresent(AttendanceInfoDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AttendanceInfoDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AttendanceInfoDO::getTenantId, reqVO.getTenantId())
+                .eq(AttendanceInfoDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(AttendanceInfoDO::getId));
     }
 
@@ -53,6 +56,7 @@ public interface AttendanceInfoMapper extends BaseMapperX<AttendanceInfoDO> {
                 .eqIfPresent(AttendanceInfoDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(AttendanceInfoDO::getPostId, reqVO.getPostId())
                 .eqIfPresent(AttendanceInfoDO::getDeptName, reqVO.getDeptName())
+                .eq(AttendanceInfoDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(AttendanceInfoDO::getId));
     }
 

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/dal/mysql/leave/AttendanceLeaveMapper.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.business.AttendanceBusinessDO;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.info.AttendanceInfoDO;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.leave.AttendanceLeaveDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.attendance.controller.admin.leave.vo.*;
 
@@ -47,6 +48,7 @@ public interface AttendanceLeaveMapper extends BaseMapperX<AttendanceLeaveDO> {
                 .likeIfPresent(AttendanceLeaveDO::getCreatorEmployeeName, reqVO.getCreatorEmployeeName())
                 .betweenIfPresent(AttendanceLeaveDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AttendanceLeaveDO::getTenantId, reqVO.getTenantId())
+                .eq(AttendanceLeaveDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(AttendanceLeaveDO::getId));
     }
 
@@ -55,6 +57,7 @@ public interface AttendanceLeaveMapper extends BaseMapperX<AttendanceLeaveDO> {
                 .eqIfPresent(AttendanceLeaveDO::getEmployeeId, employeeId)
                 .betweenIfPresent(AttendanceLeaveDO::getStartDate, new LocalDate[]{date})
                 .betweenIfPresent(AttendanceLeaveDO::getEndDate, new LocalDate[]{date})
+                .eq(AttendanceLeaveDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(AttendanceLeaveDO::getId));
     }
 

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/dal/mysql/out/AttendanceOutMapper.java

@@ -5,8 +5,10 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.attendance.dal.dataobject.info.AttendanceInfoDO;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.leave.AttendanceLeaveDO;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.out.AttendanceOutDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.attendance.controller.admin.out.vo.*;
 
@@ -43,6 +45,7 @@ public interface AttendanceOutMapper extends BaseMapperX<AttendanceOutDO> {
                 .likeIfPresent(AttendanceOutDO::getCreatorEmployeeName, reqVO.getCreatorEmployeeName())
                 .betweenIfPresent(AttendanceOutDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AttendanceOutDO::getTenantId, reqVO.getTenantId())
+                .eq(AttendanceOutDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(AttendanceOutDO::getId));
     }
 

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/dal/mysql/schedulingmanage/AttendanceSchedulingManageMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.out.AttendanceOutDO;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.schedulingmanage.AttendanceSchedulingManageDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.attendance.controller.admin.schedulingmanage.vo.*;
 
@@ -27,6 +28,7 @@ public interface AttendanceSchedulingManageMapper extends BaseMapperX<Attendance
                 .eqIfPresent(AttendanceSchedulingManageDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AttendanceSchedulingManageDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AttendanceSchedulingManageDO::getTenantId, reqVO.getTenantId())
+                .eq(AttendanceSchedulingManageDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(AttendanceSchedulingManageDO::getId));
     }
 

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/dal/mysql/workdaysetting/AttendanceWorkdaySettingMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.schedulingmanage.AttendanceSchedulingManageDO;
 import cn.iocoder.yudao.module.attendance.dal.dataobject.workdaysetting.AttendanceWorkdaySettingDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.attendance.controller.admin.workdaysetting.vo.*;
@@ -26,6 +27,7 @@ public interface AttendanceWorkdaySettingMapper extends BaseMapperX<AttendanceWo
                 .eqIfPresent(AttendanceWorkdaySettingDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AttendanceWorkdaySettingDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(AttendanceWorkdaySettingDO::getTenantId, reqVO.getTenantId())
+                .eq(AttendanceWorkdaySettingDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(AttendanceWorkdaySettingDO::getId));
     }
 

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/contract/RelationsContractMapper.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.relations.controller.admin.contract.vo.RelationsContractPageReqVO;
 import cn.iocoder.yudao.module.relations.dal.dataobject.contract.RelationsContractDO;
 import cn.iocoder.yudao.module.relations.dal.dataobject.conversion.RelationsConversionDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -38,24 +39,28 @@ public interface RelationsContractMapper extends BaseMapperX<RelationsContractDO
                 .eqIfPresent(RelationsContractDO::getEmployeeId, reqVO.getEmployeeId())
                 .eqIfPresent(RelationsContractDO::getTenantId, reqVO.getTenantId())
                 .likeIfPresent(RelationsContractDO::getCreatorEmployeeName, reqVO.getCreatorEmployeeName())
+                .eq(RelationsContractDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(RelationsContractDO::getId));
     }
 
     default List<RelationsContractDO> selectListByStatusAndEmployeeId(Integer status, Long employeeId) {
         return selectList(new LambdaQueryWrapperX<RelationsContractDO>()
                 .eqIfPresent(RelationsContractDO::getStatus, status)
+                .eq(RelationsContractDO::getDeleted, DeletedEnum.FALSE)
                 .eqIfPresent(RelationsContractDO::getEmployeeId, employeeId));
     }
 
     default List<RelationsContractDO> selectListByStatusAndEffectiveDateGe(Integer status, LocalDate now) {
         return selectList(new LambdaQueryWrapperX<RelationsContractDO>()
                 .eqIfPresent(RelationsContractDO::getStatus, status)
+                .eq(RelationsContractDO::getDeleted, DeletedEnum.FALSE)
                 .geIfPresent(RelationsContractDO::getContractStartDate, now));
     }
 
     default List<RelationsContractDO> selectListByStatusAndEmployeeIds(Integer status, Set<Long> employeeIds) {
             return selectList(new LambdaQueryWrapperX<RelationsContractDO>()
                     .eqIfPresent(RelationsContractDO::getStatus, status)
+                    .eq(RelationsContractDO::getDeleted, DeletedEnum.FALSE)
                     .inIfPresent(RelationsContractDO::getEmployeeId, employeeIds));
     }
 

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/conversion/RelationsConversionMapper.java

@@ -5,7 +5,9 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.relations.dal.dataobject.contract.RelationsContractDO;
 import cn.iocoder.yudao.module.relations.dal.dataobject.conversion.RelationsConversionDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.relations.controller.admin.conversion.vo.*;
 
@@ -42,6 +44,7 @@ public interface RelationsConversionMapper extends BaseMapperX<RelationsConversi
                 .likeIfPresent(RelationsConversionDO::getCreatorEmployeeName, reqVO.getCreatorEmployeeName())
                 .betweenIfPresent(RelationsConversionDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(RelationsConversionDO::getTenantId, reqVO.getTenantId())
+                .eq(RelationsConversionDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(RelationsConversionDO::getId));
     }
 

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/entry/RelationsEntryMapper.java

@@ -5,7 +5,9 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.relations.dal.dataobject.conversion.RelationsConversionDO;
 import cn.iocoder.yudao.module.relations.dal.dataobject.entry.RelationsEntryDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.relations.controller.admin.entry.vo.*;
 
@@ -39,6 +41,7 @@ public interface RelationsEntryMapper extends BaseMapperX<RelationsEntryDO> {
                 .likeIfPresent(RelationsEntryDO::getCreatorEmployeeName, reqVO.getCreatorEmployeeName())
                 .betweenIfPresent(RelationsEntryDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(RelationsEntryDO::getTenantId, reqVO.getTenantId())
+                .eq(RelationsEntryDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(RelationsEntryDO::getId));
     }
 

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/renew/RelationsRenewMapper.java

@@ -5,7 +5,9 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.relations.dal.dataobject.entry.RelationsEntryDO;
 import cn.iocoder.yudao.module.relations.dal.dataobject.renew.RelationsRenewDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.relations.controller.admin.renew.vo.*;
 
@@ -44,6 +46,7 @@ public interface RelationsRenewMapper extends BaseMapperX<RelationsRenewDO> {
                 .likeIfPresent(RelationsRenewDO::getCreatorEmployeeName, reqVO.getCreatorEmployeeName())
                 .betweenIfPresent(RelationsRenewDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(RelationsRenewDO::getTenantId, reqVO.getTenantId())
+                .eq(RelationsRenewDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(RelationsRenewDO::getId));
     }
 

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/turnover/RelationsTurnoverMapper.java

@@ -5,7 +5,9 @@ import java.util.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.relations.dal.dataobject.entry.RelationsEntryDO;
 import cn.iocoder.yudao.module.relations.dal.dataobject.turnover.RelationsTurnoverDO;
+import cn.iocoder.yudao.module.system.enums.common.DeletedEnum;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.relations.controller.admin.turnover.vo.*;
 
@@ -40,6 +42,7 @@ public interface RelationsTurnoverMapper extends BaseMapperX<RelationsTurnoverDO
                 .likeIfPresent(RelationsTurnoverDO::getCreatorEmployeeName, reqVO.getCreatorEmployeeName())
                 .betweenIfPresent(RelationsTurnoverDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(RelationsTurnoverDO::getTenantId, reqVO.getTenantId())
+                .eq(RelationsTurnoverDO::getDeleted, DeletedEnum.FALSE)
                 .orderByDesc(RelationsTurnoverDO::getId));
     }
 

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/DeletedEnum.java

@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.system.enums.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 删除标识的枚举值
+ *
+ * @author zhaopq
+ */
+@Getter
+@AllArgsConstructor
+public enum DeletedEnum {
+
+    /** false */
+    FALSE(false),
+    /** true */
+    TRUE(true);
+
+    /**
+     * 删除标识
+     */
+    private final Boolean deleted;
+
+}