diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java index 442115b..62952dd 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java @@ -132,6 +132,7 @@ public class ActivityDeclareMineController { } else { cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy())); } + cnd.groupBy("info.id"); sql.setCondition(cnd); Pagination pagination = activityDeclareService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql); return Result.success().addData(pagination); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java index 1dbf562..476f5a8 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java @@ -332,7 +332,6 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl entities = new ArrayList<>(); entities.add(new ExcelExportEntity("工号", "loginName", 20)); entities.add(new ExcelExportEntity("姓名", "userName", 20)); - entities.add(new ExcelExportEntity("姓名", "userName", 20)); entities.add(new ExcelExportEntity("单位", "welfareUnitName", 20)); entities.add(new ExcelExportEntity("工会", "welfareUnionName", 20)); @@ -387,7 +386,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl - + - + - - + + diff --git a/src/main/resources/views/platform/zhgh/welfare/select/index.html b/src/main/resources/views/platform/zhgh/welfare/select/index.html index 59f643b..a6cae45 100644 --- a/src/main/resources/views/platform/zhgh/welfare/select/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/select/index.html @@ -8,11 +8,11 @@ layout("/layouts/platform.html"){