导出问题

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java

@@ -141,11 +141,11 @@ public class StaffLoginLogController {
         PageData<AccountActivityInfo> res = staffLoginLogService.getAccountActivityInfo(formDTO);
         if (!CollectionUtils.isEmpty(res.getList())) {
             if("1".equals(formDTO.getIsActivity())){
-                List<AccountActivityExcel> accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountActivityExcel.class);
+//                List<AccountActivityExcel> accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountActivityExcel.class);
-                ExcelUtils.exportExcelToTarget(response, null, accountActivityExcels, AccountActivityInfo.class);
+                ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountActivityExcel.class);
             }else {
-                List<AccountInactivityExcel> accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountInactivityExcel.class);
+//                List<AccountInactivityExcel> accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountInactivityExcel.class);
-                ExcelUtils.exportExcelToTarget(response, null, accountActivityExcels, AccountActivityInfo.class);
+                ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountInactivityExcel.class);
             }
 
         }