From 5c9be24821a5487388d260796dc26f4702b674cf Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Sat, 29 Jul 2023 14:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=83=A8=E9=97=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E9=87=8D=E7=BD=AE=20=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysAnnouncementController.java | 63 -------------------
 jero-web/src/views/system/DepartList.vue      |  5 --
 jero-web/src/views/user/Login.vue             | 20 +++---
 3 files changed, 10 insertions(+), 78 deletions(-)

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<SysAnnouncement> queryWrapper = new LambdaQueryWrapper<>(sysAnnouncement);
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-		queryWrapper.eq(SysAnnouncement::getDelFlag,CommonConstant.DEL_FLAG_0);
-        List<SysAnnouncement> 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<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();// 获取上传文件对象
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<SysAnnouncement> 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 @@
               </a-form-model-item>
             </a-form-model>
             <div class="anty-form-btn">
-              <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">重置</a-button>
               <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">保存</a-button>
             </div>
           </a-card>
@@ -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 @@
           </a-col>
           <a-col :span="6"></a-col>
           <a-col :span="5" style="text-align: right;color: #1891FF;">
-            <a-form-item>
-              <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
-                忘记密码
-              </router-link>
-            </a-form-item>
+<!--            <a-form-item>-->
+<!--              <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">-->
+<!--                忘记密码-->
+<!--              </router-link>-->
+<!--            </a-form-item>-->
           </a-col>
         </a-row>
         <a-row class="login-btn">
@@ -150,11 +150,11 @@
           </a-col>
           <a-col :span="4"></a-col>
           <a-col :span="9" style="text-align: right;color: #1891FF;">
-            <a-form-item>
-              <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
-                忘记密码
-              </router-link>
-            </a-form-item>
+<!--            <a-form-item>-->
+<!--              <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">-->
+<!--                忘记密码-->
+<!--              </router-link>-->
+<!--            </a-form-item>-->
           </a-col>
         </a-row>
         <a-row class="login-btn">