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 c470b937..df46e08c 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 @@ -18,6 +18,7 @@ import com.google.common.collect.Lists; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -290,7 +291,9 @@ public class EmailMaintainController extends AbstractController { String jsonString = Base64.encode(json.toJSONString()); return ResponseEntity.ok(R.ok().put("data",jsonString)); }else{ - return ResponseEntity.ok(R.error().put("data","未查询到用户名为"+userName+"数据")); + R result = new R(500,"未查询到用户名为"+userName+"数据"); +// return ResponseEntity.ok(R.error().put("data","未查询到用户名为"+userName+"数据")); + return ResponseEntity.ok(result); } }