Merge remote-tracking branch 'origin/master'

tangzy

2021-09-03 82c1565bfb427ed2658b9790544bca258f784100

Merge remote-tracking branch 'origin/master'

 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,9 @@
                    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));
                }
            }
        }
        return directiveVoIPage;