删除

孔祥富

2021-04-01 63c7e9d7051ed6742eb7334346a53376b0247c29

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

@@ -83,7 +83,7 @@
        }
      queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "remarkDate", FebsConstant.ORDER_ASC, true);
        return empRemarkinfoMapper.selectPageVo(page, queryWrapper);
    }

@@ -171,7 +171,7 @@
                returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            empRemarkinfo.setDelFlag(2);
            empRemarkinfo.setDelFlag(0);
            empRemarkinfo.setEmpId(empId);
         empRemarkinfo.setDeptName(list.get(1).toString());
         empRemarkinfo.setDeptId(dept.getDeptId());