From e42bbb438b21ad7ef01888b7172ee5f810d2ab39 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 06 四月 2021 01:42:57 +0800
Subject: [PATCH] fix(人力微服务): 修改前端，后端判断比较多，撤回上版本操作
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
index 6001560..a168c5a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
+++ b/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())) {
@@ -238,12 +238,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpAccessory(EmpAccessory empAccessory) throws FebsException {
- if ( empAccessory.getFilesname().indexOf(".")<=0){
+ if ( empAccessory.getFilesname().lastIndexOf(".")<=0){
throw new FebsException("文件名格式错误");
}
LambdaUpdateWrapper<EmpAccessory> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(EmpAccessory::getAccessoryid,empAccessory.getAccessoryid())
- .set(EmpAccessory::getFilesname,empAccessory.getFilesname()).set(EmpAccessory::getFilesformat, empAccessory.getFilesname().substring( empAccessory.getFilesname().indexOf(".")+1));
+ .set(EmpAccessory::getFilesname,empAccessory.getFilesname()).set(EmpAccessory::getFilesformat, empAccessory.getFilesname().substring( empAccessory.getFilesname().lastIndexOf(".")+1));
this.update(wrapper);
}
@@ -282,7 +282,7 @@
if (fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() == 0) {
fileName.add(accessory.getFilesname());
} else {
- fileName.add(accessory.getFilesname().substring(0,accessory.getFilesname().indexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());
+ fileName.add(accessory.getFilesname().substring(0,accessory.getFilesname().lastIndexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());
}
});
MyUtil.download(request, response, files, fileName);
@@ -387,8 +387,8 @@
accessory.setDelFlag(0);
accessory.setEmpid(empBaseInfo.get(0).getEmpId());
accessory.setFilesaddress(file1.getName());
- if (file1.getName().indexOf(".") > 0) {
- accessory.setFilesformat( file1.getName().substring(file1.getName().indexOf(".")+1));
+ if (file1.getName().lastIndexOf(".") > 0) {
+ accessory.setFilesformat( file1.getName().substring(file1.getName().lastIndexOf(".")+1));
}
accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
accessory.setFilesname(file1.getName());
--
Gitblit v1.8.0