febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -242,6 +242,7 @@ @ApiOperation(value = "关闭员工档案") @PostMapping("dimission") @PreAuthorize("hasAuthority('empBaseinfo:dimission')") public void dimissionEmp(EmpDimissionLog empDimissionLog) throws FebsException { try { this.empBaseInfoService.closeEmpArchives(empDimissionLog); @@ -253,6 +254,7 @@ } @ApiOperation(value = "员工岗位变更") @PostMapping("jobChange") @PreAuthorize("hasAuthority('empBaseinfo:jobChange')") public void changeEmpJob(EmpJobChange empJobChange) throws FebsException { try { this.empBaseInfoService.changeEmpJob(empJobChange); febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -70,7 +70,7 @@ if (StrUtil.isNotBlank(vo.getBasic())) { queryWrapper.and(p -> { p.like("a.empNumb", vo.getBasic()) .or().like("a.deptName", vo.getBasic()) .or().like("a.allDeptName", vo.getBasic()) .or().like("a.certificateNumb", vo.getBasic()) .or().like("a.empName", vo.getBasic()) .or().like("a.jobName", vo.getBasic()); @@ -86,7 +86,7 @@ queryWrapper.like("a.certificateNumb", vo.getCertificateNumb()); } if (StrUtil.isNotBlank(vo.getDeptName())) { queryWrapper.like("a.deptName", vo.getDeptName()); queryWrapper.like("a.allDeptName", vo.getDeptName()); } if (StrUtil.isNotBlank(vo.getEntryDate())) {
