diff --git a/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java b/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java index 99310d4..77744fb 100644 --- a/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java +++ b/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java @@ -100,7 +100,6 @@ public class ActivityUnionManageController { } - @At @ViReturn @RequiresAuthentication @@ -146,7 +145,7 @@ public class ActivityUnionManageController { @ViReturn @Aop(TransAop.READ_COMMITTED) @RequiresPermissions(value = {"activity.union.info", "activity.club.info", "activity.school.info2"}, logical = Logical.OR) - public Object doSave(@Param(value = "tissue") ActivityTissue tissue){ + public Object doSave(@Param(value = "tissue") ActivityTissue tissue) { tissue.setUserId(StrUtil.isNotBlank(tissue.getUserId()) ? tissue.getUserId() : ShiroUtil.getUserId()); tissue.setApplyTime(StrUtil.isNotBlank(tissue.getApplyTime()) ? tissue.getApplyTime() : DateUtil.getDate()); tissue.setState(0); @@ -315,6 +314,7 @@ public class ActivityUnionManageController { Cnd cnd = Cnd.NEW(); cnd.and("atp.tissueId", "=", id); cnd.andEX("u.unionId", "=", unionId); + cnd.asc("atp.unitName").asc("atp.unionName").asc("applyUserUserName"); sql.setCondition(cnd); List tissuePeople = tissuePersonService.listEntity(sql); @@ -325,6 +325,7 @@ public class ActivityUnionManageController { entityList.add(new ExcelExportEntity("联系方式", "mobile", 20)); entityList.add(new ExcelExportEntity("单位", "unitName", 20)); entityList.add(new ExcelExportEntity("工会", "unionName", 20)); + entityList.add(new ExcelExportEntity("报名人", "applyUserUserName", 20)); try { ViTool.excelResponse(response, "参赛人数.xls"); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entityList, tissuePeople);