Merge remote-tracking branch 'origin/master'

孔祥富

2021-02-25 a533affac66b956b4285ed74261bdff7481133f6

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java

@@ -21,6 +21,7 @@
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.aspectj.weaver.ast.Or;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -62,7 +63,10 @@

    @Override
    public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
        QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
         QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
        if (StrUtil.isNotBlank(vo.getBasic())) {
            queryWrapper.like("a.empNumb", vo.getBasic()).or().like("a.deptName", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.jobName", vo.getBasic());
        }
        if (StrUtil.isNotBlank(vo.getEmpName())) {
            queryWrapper.like("a.empName", vo.getEmpName());
        }
@@ -111,6 +115,9 @@
        if (StrUtil.isNotBlank(vo.getPolitics())) {
                queryWrapper.in("a.politics", vo.getPolitics());
        }
        if (StrUtil.isNotBlank(vo.getEmpStatus())) {
            queryWrapper.in("a.empStatus", vo.getEmpStatus());
        }
        queryWrapper.eq("a.delFlag", 0);
        Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
        String querySql = empAccessoryMapper.getQuerySql();