From 6038dbee0781f023397d36c3f27d92a0ac9b8bc7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 Aug 2021 08:41:19 +0800
Subject: [PATCH] 审查接口修改,装备字段新增,指令查询接口修改

---
 src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 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 fb10eff..00bc1bd 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,24 +37,27 @@
 		IPage<DirectiveVo> directiveVoIPage = page.setRecords(baseMapper.selectDirectivePage(page, directive));
 		//去除接收人ids,查询出接收人名字
 		List<DirectiveVo> records = directiveVoIPage.getRecords();
-		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(",");
-			}
-			//查询图片
-			List<DirectiveFile> directiveFiles = baseMapper.getDirectiveFileList(record.getId());
-			if (directiveFiles.size()>0){
-				StringBuilder builderFile = new StringBuilder();
-				for (DirectiveFile directiveFile : directiveFiles) {
-					builderFile.append(directiveFile.getUrl()).append(",");
+		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(",");
 				}
-				String urls = builderFile.toString();
-				record.setUrl(urls.substring(0, urls.length() - 1));
+				//查询图片
+				List<DirectiveFile> directiveFiles = baseMapper.getDirectiveFileList(record.getId());
+				if (directiveFiles.size() > 0) {
+					StringBuilder builderFile = new StringBuilder();
+					for (DirectiveFile directiveFile : directiveFiles) {
+						builderFile.append(directiveFile.getUrl()).append(",");
+					}
+					String urls = builderFile.toString();
+					record.setUrl(urls.substring(0, urls.length() - 1));
+				}
+				record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
 			}
-			record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
 		}
 		return directiveVoIPage;
 	}

--
Gitblit v1.9.3