孔祥富
2021-04-01 63c7e9d7051ed6742eb7334346a53376b0247c29
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -126,7 +126,6 @@
    @ApiOperation(value = "人员基本信息逻辑删除")
    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empBaseinfo:delete')")
    public void logicDeleteEmpBaseInfo(@NotBlank(message = "{required}")  @PathVariable("ids") String ids) throws FebsException {
        try {
            this.empBaseInfoService.logicDelEmpBaseInfo(ids);
@@ -223,7 +222,7 @@
            empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList,dicItems);
            empContractInfoService.importEmpContractInfo(listObject.get(3),returnList,dicItems);
            empDimissionAttendService.importEmpDimissionAttend(listObject.get(4),returnList);
            empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList);
            empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList,dicItems);
            empResignService.importEmpResign(listObject.get(6),returnList);
            empUnemploymentService.importEmpUnemployment(listObject.get(7),returnList);
            empInsuranceService.importEmpInsurance(listObject.get(8),returnList,dicItems);