From e83cdbeae135043cbf1b316660c32bc4c8ffdb83 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期四, 13 五月 2021 15:41:57 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 dfc02f8..f876128 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
@@ -40,6 +40,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
+import java.util.function.Consumer;
/**
* 附件管理 Service实现
@@ -148,6 +149,18 @@
}
if (StringUtils.isNotBlank(vo.getEntryType())) {
queryWrapper.in("a.entryType", vo.getEntryType().split(","));
+ } if (StringUtils.isNotBlank(vo.getCertificateList())) {
+ String[] certificates = vo.getCertificateList().split(",");
+ Consumer<QueryWrapper<EmpAccessoryVO>> consumer = new Consumer<QueryWrapper<EmpAccessoryVO>>() {
+ @Override
+ public void accept(QueryWrapper<EmpAccessoryVO> wrapper) {
+ for (int i = 0; i < certificates.length; i++) {
+ String ageBtn = certificates[i];
+ wrapper.or().like("a.certificateList", ageBtn);
+ }
+ }
+ };
+ queryWrapper.and(consumer);
}
queryWrapper.inSql("c.dept_Id", remoteDeptService.userRightDepts());
if (StrUtil.isNotBlank(vo.getFileName())){
@@ -184,7 +197,6 @@
queryWrapper.orderByAsc("a.certificateNumb");
}
}
-
queryWrapper.groupBy(" a.delFlag,a.empName,a.empStatus,a.empId,a.certificateNumb,a.empNumb,deptName,a.jobName");
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
// String querySql = empAccessoryMapper.getQuerySql();
--
Gitblit v1.8.0