From abd6eaad6ef24fa6d13e60580a87d7defdc00533 Mon Sep 17 00:00:00 2001
From: Jackwang <373747285@qq.com>
Date: Wed, 12 Feb 2020 14:52:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=9E=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E5=8F=8ASQL=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java   | 3 ---
 .../src/main/resources/mapper/user/UserAnalysisDao.xml         | 2 --
 2 files changed, 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java
index ea322bef9..f47fd38a8 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java
@@ -2,8 +2,6 @@ package com.elink.esua.epdc.dto.user.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * @program: esua-epdc-cloud
  * @description: 用户数据统计/网格开通数量
@@ -17,7 +15,6 @@ public class UserCountDTO{
     /**
      * 部门id
      */
-    @NotNull(message = "部门id不能为空")
     private String deptId;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index ae45ad3c2..e71255db1 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -445,8 +445,6 @@
             LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
             ad.type_key = 'grid_party'
-            AND ad2.id != 1191534129122230274
-            AND ad2.id != 1201319745506598913
             AND ad2.id = #{deptId}
         ORDER BY
             ad.create_date ASC