删除

孔祥富

2021-04-01 63c7e9d7051ed6742eb7334346a53376b0247c29

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

@@ -175,10 +175,10 @@
        String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
        EmpBaseInfo dbInfo = this.getEmpBaseInfo(empBaseInfo);
        Long empId = SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE);
        boolean saveDimissionLog = false;
        boolean saveDimissionLog = true;
         if (dbInfo == null) {
            empBaseInfo.setEmpId(empId);
             saveDimissionLog = true;
             // saveDimissionLog = true;
        } else {
            empBaseInfo.setEmpId(dbInfo.getEmpId());
        }
@@ -193,18 +193,16 @@
        empBaseInfo.setModifier(operatorId);
        this.saveOrUpdate(empBaseInfo);

        if(saveDimissionLog) {
            EmpDimissionLog dimissionLog = new EmpDimissionLog();
            dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            dimissionLog.setEmpId(empId);
            dimissionLog.setEntryDate(empBaseInfo.getEntryDate());
            dimissionLog.setDimissionType("20");
            dimissionLog.setRemark(empBaseInfo.getRemark());
            dimissionLog.setCreator(operatorId);
            dimissionLog.setModifier(operatorId);
        EmpDimissionLog dimissionLog = new EmpDimissionLog();
        dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        dimissionLog.setEmpId(empId);
        dimissionLog.setEntryDate(empBaseInfo.getEntryDate());
        dimissionLog.setDimissionType("20");
        dimissionLog.setRemark(empBaseInfo.getRemark());
        dimissionLog.setCreator(operatorId);
        dimissionLog.setModifier(operatorId);

            dimissionLogService.save(dimissionLog);
        }
        dimissionLogService.save(dimissionLog);
    }

    @Override
@@ -639,7 +637,7 @@
            inputStream.read(buff);
            inputStream.close();

            String  contentType = empBaseInfo.getImagePath().substring(empBaseInfo.getImagePath().indexOf(".")+1);
            String  contentType = empBaseInfo.getImagePath().substring(empBaseInfo.getImagePath().lastIndexOf(".")+1);
            if (contentType.equals("tif")){
                //设置发送到客户端的响应内容类型
                response.setContentType("image/tiff");