ariesy 解决邮箱 相关bug v3

dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java

@@ -130,6 +130,16 @@ public class EmailMaintainController extends AbstractController  {
         if(maintainVo != null && maintainVo.getId().equals(emailMaintain.getId())){
             return ResponseEntity.ok(R.error("邮箱地址已存在！"));
         }
+
+        String userId = emailMaintain.getUserId();
+
+        String userName = emailMaintainService.getUserName(userId);
+        if(StringUtils.isBlank(userName)){
+            R data = new R(101, "用户编码在系统中查询不到，请核实！");
+            data.put("data", "");
+            return ResponseEntity.ok(data);
+        }
+
         boolean b = emailMaintainService.update(emailMaintain);
         if(b){
             return ResponseEntity.ok(R.ok());
@@ -242,7 +252,11 @@ public class EmailMaintainController extends AbstractController  {
             if (ObjectUtil.isNotEmpty(errorMsgList)) {
                 JSONObject json = new JSONObject();
                 json.put("datalist", errorMsgList);
-                return ResponseEntity.ok(R.ok().put("data",Base64.encode(json.toJSONString())));
+
+                R data = new R(101, "校验信息有误");
+                data.put("data", json);
+                return ResponseEntity.ok(data);
+
             }
             int i = emailMaintainService.insertBatch(mailList);
             if(i > 0){