|
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
|
|
import cn.iocoder.yudao.module.bpm.controller.admin.oa.business.vo.OaBusinessPageReqVO;
|
|
|
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.business.OaBusinessDO;
|
|
|
import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.ibatis.annotations.Mapper;
|
|
|
|
|
|
/**
|
|
@@ -31,6 +32,16 @@ public interface OaBusinessMapper extends BaseMapperX<OaBusinessDO> {
|
|
|
.likeIfPresent(OaBusinessDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
|
|
|
.betweenIfPresent(OaBusinessDO::getCreateTime, reqVO.getCreateTime())
|
|
|
.orderByDesc(OaBusinessDO::getId);
|
|
|
+ // 模糊查询信息:申请人applyEmployeeName、出差人employeeName、出差目的地destination
|
|
|
+ String str = reqVO.getStr();
|
|
|
+ if (StringUtils.isNotBlank(str)) {
|
|
|
+ lambdaQueryWrapperX.and(wrapper ->
|
|
|
+ wrapper.like(OaBusinessDO::getApplyEmployeeName, str)
|
|
|
+ .or()
|
|
|
+ .like(OaBusinessDO::getEmployeeName, str)
|
|
|
+ .or()
|
|
|
+ .like(OaBusinessDO::getDestination, str));
|
|
|
+ }
|
|
|
// 数据权限
|
|
|
DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
|
|
|
if (deptDataPermission != null) {
|