From ddae03ebb4297e78c69beab11bc8bd7e9c370913 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Wed, 24 Aug 2022 08:43:25 +0800
Subject: [PATCH] 保安公司查询修改，派遣单位字段属性修改
---
src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 002f57b..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
@@ -43,7 +43,9 @@
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());
@@ -55,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