fix(hr微服务): 修改bug

yz_08

2021-03-30 14a1d7b4f7da211a333f997d8ec5a31bfeb82f2c

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

@@ -80,12 +80,10 @@
      }
        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());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "remarkDate", FebsConstant.ORDER_ASC, true);
        return empRemarkinfoMapper.selectPageVo(page, queryWrapper);
    }

@@ -153,13 +151,16 @@
   @Transactional(rollbackFor = Exception.class)
    public void importEmpRemarkInfo(List<List<Object>> listObject,List<String>  returnList) {
       for (List<Object> list : listObject) {
            if (list.size()==0){
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
          EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
          empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
          empRemarkinfo.setEmpNumb(list.get(0).toString());
         List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            if(null == depts){
                depts =remoteDeptService.setDeptRedis();
            }
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
@@ -170,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());