From aa04cf9cec6057e88e0e502807865c1e72592ab6 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 5 Sep 2022 16:31:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=A0=87=E9=A2=98=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/entity/LawsMonthlyReportTitleTemplateEO.java | 3 +++ .../impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java index 7b9888886..4a66c3f86 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java @@ -81,4 +81,7 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable { //排序 private int sort; + + @TableField(exist = false) + private String key; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index 20950cba4..8852e0412 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -220,6 +220,10 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEOTemp, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEOTemp, req.getParameterMap()); List lawsMonthlyReportTitleTemplateEOS = this.list(queryWrapper); + for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : lawsMonthlyReportTitleTemplateEOS) { + //前端需要的特殊数据格式 + lawsMonthlyReportTitleTemplateEO.setKey(lawsMonthlyReportTitleTemplateEO.getId()); + } List parentList = lawsMonthlyReportTitleTemplateEOS.stream() .filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); Collections.sort(parentList, new Comparator() {