参数非必填及SQL调整

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;
 
 }

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