From 909e028ae50ed948c080ec4c8b97ee5c553c0257 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Fri, 21 Apr 2023 16:42:55 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mailGather/EmailMaintainController.java   | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
index 53dca740..3a126273 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
@@ -93,6 +93,7 @@ public class EmailMaintainController extends AbstractController  {
         }
         String loginname = getUserInfo().getLoginname();
         emailMaintain.setCreateUser(loginname);
+
         DynamicContextHolder.push(DbConstant.BASICS_READ);
         EmailMaintainVo vo = new EmailMaintainVo();
         vo.setEmailAddress(emailMaintain.getEmailAddress());
@@ -115,8 +116,11 @@ public class EmailMaintainController extends AbstractController  {
      */
     @PostMapping("/edit")
     public ResponseEntity<R> edit(@RequestBody  EmailMaintainVo emailMaintain) {
-        if(StringUtils.isBlank(emailMaintain.getEmailPassword())){
-            return ResponseEntity.ok(R.error("邮箱地址不能为空！"));
+        if(StringUtils.isBlank(emailMaintain.getEmailPassword()) || StringUtils.isBlank(emailMaintain.getEmailAddress()) ){
+            return ResponseEntity.ok(R.error("邮箱地址/密码不能为空！"));
+        }else {
+            String encode = Base64Encoding.encode(emailMaintain.getEmailPassword());
+            emailMaintain.setEmailPassword(encode);
         }
         DynamicContextHolder.push(DbConstant.BASICS_READ);
         EmailMaintainVo vo = new EmailMaintainVo();
@@ -132,6 +136,22 @@ public class EmailMaintainController extends AbstractController  {
         return ResponseEntity.ok(R.error());
     }
 
+    /**
+     * 编辑数据
+     *
+     * @param id id
+     * @return 删除结果
+     */
+    @PostMapping("/delete")
+    public ResponseEntity<R> delete(@RequestParam String id) {
+        DynamicContextHolder.push(DbConstant.BASICS_READ);
+        boolean b = emailMaintainService.deleteById(id);
+        if(b){
+            return ResponseEntity.ok(R.ok());
+        }
+        return ResponseEntity.ok(R.error());
+    }
+
 
     /**
      * 编辑数据