From 30df94c05573a426d030510d4dd58ae1d93bfb7a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 14:03:37 +0800
Subject: [PATCH] 1.资格审查排序
---
src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java b/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
index 00bc1bd..095b8d9 100644
--- a/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
+++ b/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
@@ -37,14 +37,15 @@
IPage<DirectiveVo> directiveVoIPage = page.setRecords(baseMapper.selectDirectivePage(page, directive));
//去除接收人ids,查询出接收人名字
List<DirectiveVo> records = directiveVoIPage.getRecords();
- System.out.println("records = " + records);
if (records.size()>0) {
for (DirectiveVo record : records) {
String[] receiveDirectiveIds = record.getReceiveDirectiveIds().toString().split(",");
StringBuilder builder = new StringBuilder();
for (String receiveDirectiveId : receiveDirectiveIds) {
User user = userService.getById(receiveDirectiveId);
- builder.append(user.getRealName()).append(",");
+ if (null!=user) {
+ builder.append(user.getRealName()).append(",");
+ }
}
//查询图片
List<DirectiveFile> directiveFiles = baseMapper.getDirectiveFileList(record.getId());
@@ -56,7 +57,16 @@
String urls = builderFile.toString();
record.setUrl(urls.substring(0, urls.length() - 1));
}
- record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
+ if (!"".equals(builder.toString())) {
+ record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
+ //如果查询接收人
+ if (null!=directive.getReceiveName() && directive.getReceiveName()!=""){
+ //不匹配就删除
+ if (!record.getReceiveName().contains(directive.getReceiveName())){
+ records.remove(record);
+ }
+ }
+ }
}
}
return directiveVoIPage;
--
Gitblit v1.9.3