From 4aa5bc205c35beb4db7160bb63d67b6075335a71 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 27 Apr 2020 15:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=8F=AF=E9=80=89=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3Bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerGridDao.xml           | 4 ++--
 .../java/com/epmet/dto/form/CommonUserIdListFormDTO.java    | 2 +-
 .../src/main/resources/mapper/CustomerStaffDao.xml          | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 7af8c21e98..e5873c263f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -233,8 +233,8 @@
     <!-- 得到当前机构的网格列表 -->
     <select id="selectGridListByAgencyId" resultType="com.epmet.dto.result.GridBaseInfoResultDTO">
         SELECT
-            ID AS grdiId,
-            GRID_NAME,
+            ID AS gridId,
+            IFNULL(GRID_NAME,"") AS gridName,
             TOTAL_USER
         FROM
             CUSTOMER_GRID
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CommonUserIdListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CommonUserIdListFormDTO.java
index 04c87ac74f..ea5e4b0ef4 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CommonUserIdListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CommonUserIdListFormDTO.java
@@ -16,13 +16,13 @@ import java.util.List;
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class CommonUserIdListFormDTO implements Serializable{
     private static final long serialVersionUID = -7045691156972928671L;
 
     /**
      * 用户列表
      * */
-    @NotBlank(message = "用户列表不能为空")
     private List<String> userIdList;
 
     @NotBlank(message = "客户Id不能为空")
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index 9f96127f78..f322594f33 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -179,9 +179,9 @@
     <select id="selectEnableStaffMsg" resultType="com.epmet.dto.result.CommonStaffInfoResultDTO">
         SELECT
             USER_ID AS staffId,
-            REAL_NAME AS staffName,
-            HEAD_PHOTO AS staffHeadPhoto ,
-            GENDER
+            IFNULL(REAL_NAME,"") AS staffName,
+            IFNULL(HEAD_PHOTO,"") AS staffHeadPhoto ,
+            IFNULL(GENDER,0) AS gender
         FROM
             CUSTOMER_STAFF
         WHERE