|
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
|
|
import cn.iocoder.yudao.module.bpm.controller.admin.oa.receive.vo.OaReceivePageReqVO;
|
|
|
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.receive.OaReceiveDO;
|
|
|
import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.ibatis.annotations.Mapper;
|
|
|
|
|
|
/**
|
|
@@ -28,6 +29,16 @@ public interface OaReceiveMapper extends BaseMapperX<OaReceiveDO> {
|
|
|
.likeIfPresent(OaReceiveDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
|
|
|
.betweenIfPresent(OaReceiveDO::getCreateTime, reqVO.getCreateTime())
|
|
|
.orderByDesc(OaReceiveDO::getId);
|
|
|
+ // 模糊查询信息:申请人applyEmployeeName、领用人employeeName、领用日期receiveDate
|
|
|
+ String str = reqVO.getStr();
|
|
|
+ if (StringUtils.isNotBlank(str)) {
|
|
|
+ lambdaQueryWrapperX.and(wrapper ->
|
|
|
+ wrapper.like(OaReceiveDO::getApplyEmployeeName, str)
|
|
|
+ .or()
|
|
|
+ .like(OaReceiveDO::getEmployeeName, str)
|
|
|
+ .or()
|
|
|
+ .like(OaReceiveDO::getReceiveDate, str));
|
|
|
+ }
|
|
|
// 数据权限
|
|
|
DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
|
|
|
if (deptDataPermission != null) {
|