From 5256daabe5ca8e221bb2d4dd6c4f9f201b989339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Wed, 20 Sep 2023 10:34:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=BB=B4=E6=8A=A4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=BB=84=E7=BB=87=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mailGather/EmailMaintainController.java          | 12 ++++--------
 .../mapper/mailGather/EmailMaintainMapper.xml        |  4 ++--
 2 files changed, 6 insertions(+), 10 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 9f7661e9..013b5883 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
@@ -65,15 +65,11 @@ public class EmailMaintainController extends AbstractController  {
 //                return ResponseEntity.ok(R.ok().put("data", ""));
 //            }
 //        }
-        Object deptId = pramsMap.get("deptId");
-        if(deptId == null || "".equals(String.valueOf(deptId))){
-            return ResponseEntity.ok(R.error("该组织未配置税号，请先联系管理员"));
+        String companyCode = (String) pramsMap.get("companyCode");
+        if(StringUtils.isBlank(companyCode)){
+            return ResponseEntity.ok(R.error("组织编码不能为空"));
         }
-        if("99".equals(String.valueOf(deptId))){
-            pramsMap.put("deptId","");
-        }
-        UserInfo userInfo = getUserInfo();
-        log.debug("用户信息：{}", JSONObject.toJSONString(userInfo));
+
         String loginname = getUserInfo().getLoginname();
         pramsMap.put("createUser",loginname);
         return ResponseEntity.ok(R.ok().put("data",this.emailMaintainService.queryByPage(pramsMap)));
diff --git a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml
index f7ba5c48..8d34677c 100644
--- a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml
@@ -32,8 +32,8 @@
           id, dept_id, company_code, dept_name, username, user_id, email_address,email_password, create_time, del_status, modify_time
         from email_maintain
         <where>
-            <if test="deptId != null and deptId != ''">
-                and dept_id = #{deptId}
+            <if test="companyCode != null and companyCode != ''">
+                and company_code = #{companyCode}
             </if>
             <if test="username != null and username != ''">
                 and username = #{username}