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

法规月报--列表展示法规联系人(中英文切换)

Browse Source
This commit is contained in:
zhn
2022-09-25 14:14:21 +08:00
parent 2a114f0149
commit edad4c8c80
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+7 -3
View File
@@ -344,7 +344,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) { for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) {
//处理法规联系人 //处理法规联系人
lawsContact(userList, lawsMonthlyReportWriteEO); lawsContact(userList, lawsMonthlyReportWriteEO,lawsMonthlyReportWriteEOTemp.getCut());
//处理章节目录 //处理章节目录
if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){ if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){
List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream()
@@ -400,7 +400,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
return pageInfo; return pageInfo;
} }
private void lawsContact(List<LoginUser> userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { private void lawsContact(List<LoginUser> userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,String cut) {
String lawsContact = lawsMonthlyReportWriteEO.getLawsContact(); String lawsContact = lawsMonthlyReportWriteEO.getLawsContact();
if(StringUtils.isNotBlank(lawsContact)){ if(StringUtils.isNotBlank(lawsContact)){
List<LoginUser> collect = userList.stream().filter(e -> lawsContact.contains(e.getId())).collect(Collectors.toList()); List<LoginUser> collect = userList.stream().filter(e -> lawsContact.contains(e.getId())).collect(Collectors.toList());
@@ -408,7 +408,11 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
for (String s : lawsContact.split(",")) { for (String s : lawsContact.split(",")) {
List<LoginUser> loginUserList = collect.stream().filter(e -> e.getId().equals(s)).collect(Collectors.toList()); List<LoginUser> loginUserList = collect.stream().filter(e -> e.getId().equals(s)).collect(Collectors.toList());
if(loginUserList.size() != 0){ if(loginUserList.size() != 0){
sb.append(loginUserList.get(0).getUsername()+","); if(CutEnum.CN.getValue().equals(cut)){
sb.append(loginUserList.get(0).getRealname()+",");
}else{
sb.append(loginUserList.get(0).getUsername()+",");
}
} }
} }
if(StringUtils.isNotBlank(sb)){ if(StringUtils.isNotBlank(sb)){