邮箱维护查询修改为组织维度

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");
+        String companyCode = (String) pramsMap.get("companyCode");
-        if(deptId == null || "".equals(String.valueOf(deptId))){
+        if(StringUtils.isBlank(companyCode)){
-            return ResponseEntity.ok(R.error("该组织未配置税号，请先联系管理员"));
+            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)));

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 != ''">
+            <if test="companyCode != null and companyCode != ''">
-                and dept_id = #{deptId}
+                and company_code = #{companyCode}
             </if>
             <if test="username != null and username != ''">
                 and username = #{username}