From 6328f096bc75d835ecf6c25f58f1a452b8800a86 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期四, 04 三月 2021 02:00:48 +0800
Subject: [PATCH] 数据权限加到考勤情况位置
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index 0e2371b..def15db 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
+import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
import cn.hutool.core.date.DateUtil;
@@ -15,10 +16,12 @@
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import java.util.*;
@@ -37,31 +40,34 @@
class EmpWorkExperienceServiceImpl extends ServiceImpl<EmpWorkExperienceMapper, EmpWorkExperience> implements IEmpWorkExperienceService {
private final EmpWorkExperienceMapper empWorkexperienceMapper;
+ private final IRemoteDeptService remoteDeptService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@Override
public IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience) {
- LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
+ QueryWrapper<EmpWorkExperience> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("a.delFlag",empWorkexperience.getDelFlag());
if (StringUtils.isNotBlank(empWorkexperience.getEmpNumb())) {
- queryWrapper.like(EmpWorkExperience::getEmpNumb, empWorkexperience.getEmpNumb());
+ queryWrapper.like("a.empNumb", empWorkexperience.getEmpNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getEmpName())) {
- queryWrapper.like(EmpWorkExperience::getEmpName, empWorkexperience.getEmpName());
+ queryWrapper.like("a.EmpName", empWorkexperience.getEmpName());
}
if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
- queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ queryWrapper.like("a.certificateNumb", empWorkexperience.getCertificateNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getCertificateNumb())) {
- queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb());
+ queryWrapper.like("a.certificateNumb", empWorkexperience.getCertificateNumb());
}
if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) {
- queryWrapper.like(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent());
+ queryWrapper.like("a.jobContent", empWorkexperience.getJobContent());
}
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+
+ queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+ return this.empWorkexperienceMapper.selectPageVo(page, queryWrapper);
}
@Override
--
Gitblit v1.8.0