From 4d2f63555b6c4cbdcf6daa984a8818055644a36a Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Thu, 14 Jun 2018 22:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8E=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/lxyer/bbs/base/BaseService.java | 38 ++++++++++++-------------
 src/com/lxyer/bbs/base/BaseServlet.java |  4 ++-
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/com/lxyer/bbs/base/BaseService.java b/src/com/lxyer/bbs/base/BaseService.java
index 9beb2d1..b04d76b 100644
--- a/src/com/lxyer/bbs/base/BaseService.java
+++ b/src/com/lxyer/bbs/base/BaseService.java
@@ -38,38 +38,38 @@ public class BaseService<F extends UF,I extends UI> implements Service {
 
 
     protected Sheet<I> createInfo(Sheet<F> fSheet){
+        Sheet<I> sheet = new Sheet<>();
+
         if (fSheet == null || fSheet.getTotal() < 1){
-            Sheet<I> sheet = new Sheet<>();
             sheet.setTotal(0);
             sheet.setRows(new ArrayList<>());
-            return sheet;
-        }
-        List<I> list = new ArrayList<>((int)fSheet.getTotal());
-        fSheet.forEach(x->{
-            list.add((I)x.createInfo());
-        });
+        }else {
+            int total = (int)fSheet.getTotal();
+            List<I> rows = new ArrayList<>(total);
+            fSheet.forEach(x->rows.add((I)x.createInfo()));
+
+            sheet.setTotal(total);
+            sheet.setRows(rows);
+        }
 
-        Sheet<I> sheet = new Sheet<>();
-        sheet.setTotal(fSheet.getTotal());
-        sheet.setRows(list);
         return sheet;
     }
 
+    /**
+     * 批量设置用户信息
+     * @param ufSheet
+     * @param <I>
+     * @return
+     */
     protected <I extends UI> Sheet<I> setIUser(Sheet<I> ufSheet){
         int[] userIds = ufSheet.stream().mapToInt(I::getUserId).toArray();
-        List<User> users = source.queryList(User.class, FilterNode.create("userId", FilterExpress.IN, userIds));
-        List<I> infos = new ArrayList((int) ufSheet.getTotal());
 
+        List<User> users = source.queryList(User.class, FilterNode.create("userId", FilterExpress.IN, userIds));
         ufSheet.forEach(x->{
             User user = users.stream().filter(u -> u.getUserId() == x.getUserId()).findAny().orElse(null);
-            infos.add((I) x.setUser(user));
+            x.setUser(user);
         });
-
-        Sheet<I> sheet = new Sheet<>();
-        sheet.setTotal(ufSheet.getTotal());
-        sheet.setRows(infos);
-
-        return sheet;
+        return ufSheet;
     }
 
     /**
diff --git a/src/com/lxyer/bbs/base/BaseServlet.java b/src/com/lxyer/bbs/base/BaseServlet.java
index 49c3698..2742ec9 100644
--- a/src/com/lxyer/bbs/base/BaseServlet.java
+++ b/src/com/lxyer/bbs/base/BaseServlet.java
@@ -110,7 +110,9 @@ public class BaseServlet extends HttpServlet {
     }
 
     public void finish(String view, Kv kv) {
-        if (request.currentUser() != null) kv.set("mine", request.currentUser());
+        if (request.currentUser() != null){
+            kv.set("mine", request.currentUser());
+        }
 
         Template template = engine.getTemplate(view);
         String str = template.renderToString(kv);