diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java index 7d9474e7..5ef3f438 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java @@ -329,69 +329,6 @@ public class SysAnnouncementController { return result; } - - /** - * 导出excel - * - * @param request - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(SysAnnouncement sysAnnouncement,HttpServletRequest request) { - // Step.1 组装查询条件 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(sysAnnouncement); - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - queryWrapper.eq(SysAnnouncement::getDelFlag,CommonConstant.DEL_FLAG_0); - List pageList = sysAnnouncementService.list(queryWrapper); - //导出文件名称 - mv.addObject(JeroController.FILE_NAME, "系统通告列表"); - mv.addObject(JeroController.CLASS, SysAnnouncement.class); - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - mv.addObject(JeroController.PARAMS, new ExportParams("系统通告列表数据", "导出人:"+user.getRealname(), "导出信息")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ -// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - @PostMapping("/importExcel") - public Results importExcel(HttpServletRequest request, HttpServletResponse response) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - Map fileMap = multipartRequest.getFileMap(); - for (Map.Entry entity : fileMap.entrySet()) { - MultipartFile file = entity.getValue();// 获取上传文件对象 - ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setNeedSave(true); - try { - List listSysAnnouncements = ExcelImportUtil.importExcel(file.getInputStream(), SysAnnouncement.class, params); - for (SysAnnouncement sysAnnouncementExcel : listSysAnnouncements) { - if(sysAnnouncementExcel.getDelFlag()==null){ - sysAnnouncementExcel.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); - } - sysAnnouncementService.save(sysAnnouncementExcel); - } - return Results.OK("文件导入成功!数据行数:" + listSysAnnouncements.size()); - } catch (Exception e) { - log.error(e.getMessage(),e); - return Results.error("文件导入失败!"); - } finally { - try { - file.getInputStream().close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return Results.error("文件导入失败!"); - } /** *同步消息 * @param anntId diff --git a/jero-web/src/views/system/DepartList.vue b/jero-web/src/views/system/DepartList.vue index 937f8af1..b30ef20b 100644 --- a/jero-web/src/views/system/DepartList.vue +++ b/jero-web/src/views/system/DepartList.vue @@ -124,7 +124,6 @@
- 重置 保存
@@ -436,10 +435,6 @@ export default { } }) }, - emptyCurrForm () { - this.$refs.form.resetFields() - this.model = {} - }, nodeSettingFormSubmit () { this.$refs.form.validate(valid => { if (valid) { diff --git a/jero-web/src/views/user/Login.vue b/jero-web/src/views/user/Login.vue index 750b03da..b9805bb2 100644 --- a/jero-web/src/views/user/Login.vue +++ b/jero-web/src/views/user/Login.vue @@ -67,11 +67,11 @@ - - - 忘记密码 - - + + + + +