feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java

@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmResignationApplicationDO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;

@@ -46,6 +47,8 @@
    default int submitAndResetAuditInfo(Long id, Integer status) {
        return update(null, new LambdaUpdateWrapper<HrmResignationApplicationDO>()
                .eq(HrmResignationApplicationDO::getId, id)
                .in(HrmResignationApplicationDO::getStatus,
                        HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
                .set(HrmResignationApplicationDO::getStatus, status)
                .set(HrmResignationApplicationDO::getReviewerId, null)
                .set(HrmResignationApplicationDO::getReviewerName, null)
@@ -69,6 +72,7 @@
                                            String reviewerName, String reviewRemark) {
        return update(null, new LambdaUpdateWrapper<HrmResignationApplicationDO>()
                .eq(HrmResignationApplicationDO::getId, id)
                .eq(HrmResignationApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
                .set(HrmResignationApplicationDO::getStatus, status)
                .set(HrmResignationApplicationDO::getReviewerId, reviewerId)
                .set(HrmResignationApplicationDO::getReviewerName, reviewerName)
@@ -76,6 +80,20 @@
                .set(HrmResignationApplicationDO::getReviewRemark, reviewRemark));
    }

    /**
     * BPM 审批结束后回写离职申请状态
     *
     * 仅当申请仍处于「审批中」时更新，避免与旧审批路径重复覆盖。
     */
    default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
        return update(null, new LambdaUpdateWrapper<HrmResignationApplicationDO>()
                .eq(HrmResignationApplicationDO::getId, id)
                .eq(HrmResignationApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
                .set(HrmResignationApplicationDO::getStatus, status)
                .set(HrmResignationApplicationDO::getReviewTime, LocalDateTime.now())
                .set(HrmResignationApplicationDO::getReviewRemark, reviewRemark));
    }

    default HrmResignationApplicationDO selectByUserIdAndStatusNot(Long userId, Integer status) {
        return selectOne(new LambdaQueryWrapperX<HrmResignationApplicationDO>()
                .eq(HrmResignationApplicationDO::getUserId, userId)