fix(hrm): 修复修改员工时的「部门不存在」与「系统异常」

tuqin

3 天以前 ce96310177bdd6d24ac90bd6f92d8def30b680af

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/employee/HrmEmployeeMapper.java

@@ -1,24 +1,50 @@
package cn.iocoder.yudao.module.hrm.dal.mysql.employee;

import cn.hutool.core.util.StrUtil;
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.hrm.controller.admin.employee.vo.HrmEmployeePageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.Collection;
import java.util.List;

/**
 * 员工信息 Mapper
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Mapper
public interface HrmEmployeeMapper extends BaseMapperX<HrmEmployeeDO> {

    default HrmEmployeeDO selectByPhone(String phone) {
        return selectOne(HrmEmployeeDO::getPhone, phone);
    }

    /**
     * 按手机号查询（**包含已逻辑删除的记录**）。
     * 唯一性校验必须包含已删除记录：hrm_employee.uk_phone 唯一索引不区分 deleted，
     * 若只查未删除记录会漏判，写库时抛唯一约束异常，前端表现为“系统异常”。
     */
    @Select("SELECT * FROM hrm_employee WHERE phone = #{phone} LIMIT 1")
    HrmEmployeeDO selectByPhoneIgnoreDeleted(@Param("phone") String phone);

    /**
     * 按员工编号查询（**包含已逻辑删除的记录**），用途同上。
     */
    @Select("SELECT * FROM hrm_employee WHERE employee_no = #{employeeNo} LIMIT 1")
    HrmEmployeeDO selectByEmployeeNoIgnoreDeleted(@Param("employeeNo") String employeeNo);

    default HrmEmployeeDO selectByName(String name) {
        return selectOne(HrmEmployeeDO::getName, name);
    }

    default List<HrmEmployeeDO> selectListByName(String name) {
        return selectList(HrmEmployeeDO::getName, name);
    }

    default HrmEmployeeDO selectByEmployeeNo(String employeeNo) {
@@ -38,12 +64,41 @@
    }

    default PageResult<HrmEmployeeDO> selectPage(HrmEmployeePageReqVO reqVO) {
        return selectPage(reqVO, new LambdaQueryWrapperX<HrmEmployeeDO>()
        LambdaQueryWrapperX<HrmEmployeeDO> wrapper = new LambdaQueryWrapperX<HrmEmployeeDO>()
                .likeIfPresent(HrmEmployeeDO::getEmployeeNo, reqVO.getEmployeeNo())
                .likeIfPresent(HrmEmployeeDO::getName, reqVO.getName())
                .eqIfPresent(HrmEmployeeDO::getDeptId, reqVO.getDeptId())
                .eqIfPresent(HrmEmployeeDO::getEmployeeStatus, reqVO.getEmployeeStatus())
                .orderByDesc(HrmEmployeeDO::getId));
                .eqIfPresent(HrmEmployeeDO::getEmployeeStatus, reqVO.getEmployeeStatus());
        appendKeyword(wrapper, reqVO.getKeyword());
        wrapper.orderByDesc(HrmEmployeeDO::getId);
        return selectPage(reqVO, wrapper);
    }

    /**
     * 按部门集合（含子部门）分页查询员工
     */
    default PageResult<HrmEmployeeDO> selectPageByDeptIds(HrmEmployeePageReqVO reqVO, Collection<Long> deptIds) {
        LambdaQueryWrapperX<HrmEmployeeDO> wrapper = new LambdaQueryWrapperX<HrmEmployeeDO>()
                .likeIfPresent(HrmEmployeeDO::getEmployeeNo, reqVO.getEmployeeNo())
                .likeIfPresent(HrmEmployeeDO::getName, reqVO.getName())
                .inIfPresent(HrmEmployeeDO::getDeptId, deptIds)
                .eqIfPresent(HrmEmployeeDO::getEmployeeStatus, reqVO.getEmployeeStatus());
        appendKeyword(wrapper, reqVO.getKeyword());
        wrapper.orderByDesc(HrmEmployeeDO::getId);
        return selectPage(reqVO, wrapper);
    }

    /**
     * 关键词模糊匹配员工编号 / 姓名 / 手机号
     */
    private void appendKeyword(LambdaQueryWrapperX<HrmEmployeeDO> wrapper, String keyword) {
        if (StrUtil.isBlank(keyword)) {
            return;
        }
        String kw = keyword.trim();
        wrapper.and(w -> w.like(HrmEmployeeDO::getEmployeeNo, kw)
                .or().like(HrmEmployeeDO::getName, kw)
                .or().like(HrmEmployeeDO::getPhone, kw));
    }

    default List<HrmEmployeeDO> selectListByStatus(Integer employeeStatus) {
@@ -52,4 +107,8 @@
                .orderByAsc(HrmEmployeeDO::getName));
    }

}
    default Long selectCountBySalaryStructureId(Long salaryStructureId) {
        return selectCount(HrmEmployeeDO::getSalaryStructureId, salaryStructureId);
    }

}