WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整相关人员名单导入账号大小写错误的问题

Browse Source
This commit is contained in:
zer0Black
2022-07-22 15:15:51 +08:00
parent 6fddd2f92c
commit 4628439169
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java
-2
View File
@@ -12,8 +12,6 @@ public enum SearchEnum {
FULL_TEXT_SEARCH_CN("全部中文","fulltextsearchcn"), FULL_TEXT_SEARCH_CN("全部中文","fulltextsearchcn"),
FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen"); FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen");
String name; String name;
String value; String value;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+4 -11
View File
@@ -55,14 +55,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -1047,7 +1040,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
StringBuilder midId = new StringBuilder(); StringBuilder midId = new StringBuilder();
for (String data : lawEngineerNameList) { for (String data : lawEngineerNameList) {
if (StringUtils.isNotEmpty(lawEngineerName)) { if (StringUtils.isNotEmpty(lawEngineerName)) {
lawEngineerId = lawEngineerUsers.stream().filter(e -> data.equals(e.getUsername())) lawEngineerId = lawEngineerUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase()))
.map(sysUser -> sysUser.getId()).collect(Collectors.joining(",")); .map(sysUser -> sysUser.getId()).collect(Collectors.joining(","));
} }
midId.append(lawEngineerId).append(","); midId.append(lawEngineerId).append(",");
@@ -1081,7 +1074,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
StringBuilder midId = new StringBuilder(); StringBuilder midId = new StringBuilder();
for (String data : engineeringInterfacePersonNameList) { for (String data : engineeringInterfacePersonNameList) {
if (StringUtils.isNotEmpty(engineeringInterfacePersonName)) { if (StringUtils.isNotEmpty(engineeringInterfacePersonName)) {
engineeringInterfacePersonId = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getUsername())) engineeringInterfacePersonId = engineeringInterfacePersonUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase()))
.map(sysUser -> sysUser.getId()).collect(Collectors.joining(",")); .map(sysUser -> sysUser.getId()).collect(Collectors.joining(","));
} }
midId.append(engineeringInterfacePersonId).append(","); midId.append(engineeringInterfacePersonId).append(",");
@@ -1130,7 +1123,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
StringBuilder midId = new StringBuilder(); StringBuilder midId = new StringBuilder();
for (String data : certificationEngineerNameList) { for (String data : certificationEngineerNameList) {
if (StringUtils.isNotEmpty(certificationEngineerName)) { if (StringUtils.isNotEmpty(certificationEngineerName)) {
certificationEngineerId = certificationEngineerUsers.stream().filter(e -> data.equals(e.getUsername())) certificationEngineerId = certificationEngineerUsers.stream().filter(e -> data.toLowerCase().equals(e.getUsername().toLowerCase()))
.map(sysUser -> sysUser.getId()).collect(Collectors.joining(",")); .map(sysUser -> sysUser.getId()).collect(Collectors.joining(","));
} }
midId.append(certificationEngineerId).append(","); midId.append(certificationEngineerId).append(",");