xx

孔祥富

2021-03-10 67abd83ce5d31a6dde9d744a80350c9c05fbb6dd

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

@@ -76,6 +76,11 @@
      if (StringUtils.isNotBlank(empRemarkinfo.getRemarkContent())) {
         queryWrapper.like("a.RemarkContent", empRemarkinfo.getRemarkContent());
      }
        if (StringUtils.isNotBlank(empRemarkinfo.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empRemarkinfo.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
      queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return empRemarkinfoMapper.selectPageVo(page, queryWrapper);