From 79cdcc2167df9e04b24e2d48a0e71e0a883daa7c Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期六, 27 二月 2021 03:35:21 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 5a8ebe4..b6f4d6d 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
@@ -21,6 +21,7 @@
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.aspectj.weaver.ast.Or;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -62,7 +63,10 @@
@Override
public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
- QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
+ if (StrUtil.isNotBlank(vo.getBasic())) {
+ queryWrapper.like("a.empNumb", vo.getBasic()).or().like("a.deptName", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.jobName", vo.getBasic());
+ }
if (StrUtil.isNotBlank(vo.getEmpName())) {
queryWrapper.like("a.empName", vo.getEmpName());
}
@@ -110,6 +114,12 @@
}
if (StrUtil.isNotBlank(vo.getPolitics())) {
queryWrapper.in("a.politics", vo.getPolitics());
+ }
+ if (StrUtil.isNotBlank(vo.getEmpStatus())) {
+ queryWrapper.in("a.empStatus", vo.getEmpStatus());
+ }
+ if (StrUtil.isNotBlank(vo.getPolitics())) {
+ queryWrapper.in("a.politics", vo.getPolitics());
}
queryWrapper.eq("a.delFlag", 0);
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -203,7 +213,6 @@
@Override
public void mvFiles(String accessoryids,Long labelid,Long empId) {
String[] arr = accessoryids.split(",");
-
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
wapper.in(EmpAccessory::getAccessoryid, arr);
wapper.set(EmpAccessory::getModifier,operatorId);
--
Gitblit v1.8.0