From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSalaryMapper.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSalaryMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSalaryMapper.java
index d05bee2..540270c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSalaryMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/salary/HrmEmployeeSalaryMapper.java
@@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.hrm.dal.mysql.salary;
+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.salary.vo.HrmEmployeeSalaryPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.salary.HrmEmployeeSalaryDO;
import org.apache.ibatis.annotations.Mapper;
@@ -15,6 +17,11 @@
*/
@Mapper
public interface HrmEmployeeSalaryMapper extends BaseMapperX<HrmEmployeeSalaryDO> {
+
+ default long selectCountByStructureId(Long structureId) {
+ return selectCount(new LambdaQueryWrapperX<HrmEmployeeSalaryDO>()
+ .eq(HrmEmployeeSalaryDO::getSalaryStructureId, structureId));
+ }
default HrmEmployeeSalaryDO selectByUserIdAndEffectiveDate(Long userId, LocalDate effectiveDate) {
return selectOne(new LambdaQueryWrapperX<HrmEmployeeSalaryDO>()
@@ -36,4 +43,12 @@
.orderByDesc(HrmEmployeeSalaryDO::getEffectiveDate));
}
-}
\ No newline at end of file
+ default PageResult<HrmEmployeeSalaryDO> selectPage(HrmEmployeeSalaryPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<HrmEmployeeSalaryDO>()
+ .eqIfPresent(HrmEmployeeSalaryDO::getUserId, reqVO.getUserId())
+ .eqIfPresent(HrmEmployeeSalaryDO::getSalaryStructureId, reqVO.getSalaryStructureId())
+ .eqIfPresent(HrmEmployeeSalaryDO::getStatus, reqVO.getStatus())
+ .orderByDesc(HrmEmployeeSalaryDO::getId));
+ }
+
+}
--
Gitblit v1.9.3