From 658898d28cded745ca15ee0a89e3025358356259 Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期一, 23 九月 2024 17:53:56 +0800
Subject: [PATCH] CRM邮箱功能调整
---
src/com/yc/crm/mail/action/MailBlacklist.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/com/yc/crm/mail/action/MailBlacklist.java b/src/com/yc/crm/mail/action/MailBlacklist.java
index 353f822..b7b424b 100644
--- a/src/com/yc/crm/mail/action/MailBlacklist.java
+++ b/src/com/yc/crm/mail/action/MailBlacklist.java
@@ -14,7 +14,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @BelongsProject: eCoWorksV3
@@ -77,13 +80,13 @@
public AllBackMsg updateBlackList(@RequestBody T482106Entity BlackList, HttpServletRequest request, HttpServletResponse response) {
AllBackMsg msg = new AllBackMsg();
try {
- if(BlackList.getBlackId()==0){
+ if (BlackList.getBlackId() == null || BlackList.getBlackId().equals(0)) {
msg.setFail("鑾峰彇涓嶅埌榛戝悕鍗旾D锛岃妫�鏌�");
return msg;
}
HttpSession session = request.getSession();
String userCode = (String) session.getAttribute(SessionKey.USERCODE);
- if(StringUtils.isBlank(userCode)){
+ if (StringUtils.isBlank(userCode)) {
msg.setFail("鐧诲綍鐢ㄦ埛宸茶繃鏈燂紝璇锋鏌�");
return msg;
}
@@ -112,19 +115,19 @@
public AllBackMsg deleteBlackList(@RequestParam(defaultValue = "0") Integer blackId, HttpServletRequest request, HttpServletResponse response) {
AllBackMsg msg = new AllBackMsg();
try {
- if (blackId == 0) {
+ if (blackId.equals(0)) {
msg.setFail("榛戝悕鍗旾D鑾峰彇涓嶅埌");
return msg;
}
HttpSession session = request.getSession();
String userCode = (String) session.getAttribute(SessionKey.USERCODE);
- if(StringUtils.isBlank(userCode)){
+ if (StringUtils.isBlank(userCode)) {
msg.setFail("鐧诲綍鐢ㄦ埛宸茶繃鏈燂紝璇锋鏌�");
return msg;
}
DataSourceEntity dataSource = MultiDataSource.getDataSourceMap(request);//鑾峰彇鏁版嵁婧�
SpObserver.setDBtoInstance("_" + dataSource.getDbId());
- Integer cont = mailBlackListIfc.deleteBlackList(userCode,blackId);
+ Integer cont = mailBlackListIfc.deleteBlackList(userCode, blackId);
if (cont > 0) {
msg.setOk("宸插垹闄�");
}
@@ -143,19 +146,37 @@
* @return
*/
@GetMapping("/getBlackList.do")
- public AllBackMsg getSignature(String search, HttpServletRequest request, HttpServletResponse response) {
+ public AllBackMsg getSignature(String search, @RequestParam(defaultValue = "-1") Integer type, HttpServletRequest request, HttpServletResponse response) {
AllBackMsg msg = new AllBackMsg();
try {
HttpSession session = request.getSession();
String userCode = (String) session.getAttribute(SessionKey.USERCODE);
- if(StringUtils.isBlank(userCode)){
+ if (StringUtils.isBlank(userCode)) {
msg.setFail("鐧诲綍鐢ㄦ埛宸茶繃鏈燂紝璇锋鏌�");
return msg;
}
DataSourceEntity dataSource = MultiDataSource.getDataSourceMap(request);//鑾峰彇鏁版嵁婧�
SpObserver.setDBtoInstance("_" + dataSource.getDbId());
- List<T482106Entity> list = mailBlackListIfc.getBlackList(userCode,search);
- msg.setSuccess("鎵ц鎴愬姛", list);
+ List<T482106Entity> list = mailBlackListIfc.getBlackList(userCode, search, type);
+ Map<String, Object> map = new HashMap<>();
+ if (list.size() > 0) {
+ List<T482106Entity> mail = new ArrayList<>();
+ List<T482106Entity> domain = new ArrayList<>();
+ for (T482106Entity t482106 : list) {
+ if (t482106.isBlackType()) {//true琛ㄧず鍩熷悕
+ domain.add(t482106);
+ } else {//閭鍦板潃
+ mail.add(t482106);
+ }
+ }
+ map.put("code", 0);
+ map.put("mail", mail);
+ map.put("domain", domain);
+ } else {
+ map.put("code", 0);
+ map.put("msg", "鏁版嵁鑾峰彇涓虹┖");
+ }
+ msg.setSuccess("鎵ц鎴愬姛", map);
} catch (Exception e) {
msg.setFail(e.getCause() != null ? e.getCause().getMessage() : e.getMessage());
} finally {
--
Gitblit v1.8.0