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 implements Service { protected Sheet createInfo(Sheet fSheet){ + Sheet sheet = new Sheet<>(); + if (fSheet == null || fSheet.getTotal() < 1){ - Sheet sheet = new Sheet<>(); sheet.setTotal(0); sheet.setRows(new ArrayList<>()); - return sheet; - } - List list = new ArrayList<>((int)fSheet.getTotal()); - fSheet.forEach(x->{ - list.add((I)x.createInfo()); - }); + }else { + int total = (int)fSheet.getTotal(); + List rows = new ArrayList<>(total); + fSheet.forEach(x->rows.add((I)x.createInfo())); + + sheet.setTotal(total); + sheet.setRows(rows); + } - Sheet sheet = new Sheet<>(); - sheet.setTotal(fSheet.getTotal()); - sheet.setRows(list); return sheet; } + /** + * 批量设置用户信息 + * @param ufSheet + * @param + * @return + */ protected Sheet setIUser(Sheet ufSheet){ int[] userIds = ufSheet.stream().mapToInt(I::getUserId).toArray(); - List users = source.queryList(User.class, FilterNode.create("userId", FilterExpress.IN, userIds)); - List infos = new ArrayList((int) ufSheet.getTotal()); + List 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 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);