查找可选人员列表接口Bug修复

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,
+            ID AS gridId,
-            GRID_NAME,
+            IFNULL(GRID_NAME,"") AS gridName,
             TOTAL_USER
         FROM
             CUSTOMER_GRID

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不能为空")

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,
+            IFNULL(REAL_NAME,"") AS staffName,
-            HEAD_PHOTO AS staffHeadPhoto ,
+            IFNULL(HEAD_PHOTO,"") AS staffHeadPhoto ,
-            GENDER
+            IFNULL(GENDER,0) AS gender
         FROM
             CUSTOMER_STAFF
         WHERE