From 4e1b96defaefb3f6ec5aa64409becef5420747c8 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 13 Apr 2020 13:41:09 +0800
Subject: [PATCH] =?UTF-8?q?user=5Frole=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BCID=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/UserRoleDTO.java          | 5 +++++
 .../src/main/java/com/epmet/entity/UserRoleEntity.java    | 8 +++++---
 .../src/main/java/com/epmet/excel/UserRoleExcel.java      | 3 +++
 .../src/main/resources/mapper/UserRoleDao.xml             | 1 +
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java
index e5f599b49a..f7ef5d6446 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java
@@ -44,6 +44,11 @@ public class UserRoleDTO implements Serializable {
      */
 	private String customerId;
 
+	/**
+	 * 网格Id (customer_grid.id)
+	 */
+	private String gridId;
+
     /**
      * 用户Id user.id
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserRoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserRoleEntity.java
index 6fd5a23f7f..dbce8f7a77 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserRoleEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserRoleEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户角色关系表 
  *
@@ -43,6 +40,11 @@ public class UserRoleEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 * 网格Id (customer_grid.id)
+	 */
+	private String gridId;
+
     /**
      * 用户Id user.id
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserRoleExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserRoleExcel.java
index 0ac921f68e..4f21696f49 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserRoleExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserRoleExcel.java
@@ -37,6 +37,9 @@ public class UserRoleExcel {
     @Excel(name = "客户Id customer.id")
     private String customerId;
 
+    @Excel(name = "网格ID")
+    private String gridId;
+
     @Excel(name = "用户Id user.id")
     private String userId;
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
index dc4a525517..e33db2134f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
@@ -6,6 +6,7 @@
     <resultMap type="com.epmet.entity.UserRoleEntity" id="userRoleMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="roleId" column="ROLE_ID"/>
         <result property="delFlag" column="DEL_FLAG"/>