From 843607e3a9e64622f3d3373e4b02555f98dcb323 Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 23 Apr 2023 17:08:28 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=20=E7=9B=B8=E5=85=B3bug=20v3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mailGather/EmailMaintainController.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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 1f882266..a4e1480e 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 @@ -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){