From 4f8b11d445fb78afa3b61bf2c5b48767b24123db Mon Sep 17 00:00:00 2001
From: flying <xusheng1987@gmail.com>
Date: Thu, 8 Feb 2018 19:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E7=9A=84re?=
 =?UTF-8?q?sultMap=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=90=AF=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappings/modules/sys/RoleDao.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mappings/modules/sys/RoleDao.xml b/src/main/resources/mappings/modules/sys/RoleDao.xml
index 5e28cb7e44..33089c36c8 100644
--- a/src/main/resources/mappings/modules/sys/RoleDao.xml
+++ b/src/main/resources/mappings/modules/sys/RoleDao.xml
@@ -4,10 +4,8 @@
     
     <resultMap id="roleResult" type="Role">
 		<id property="id" column="id" />
-	    	<association property="office" javaType="Office">
-			<id property="id" column="office.id" />
-			<id property="name" column="office.name" />
-		</association>
+		<result property="office.id" column="office.id" />
+		<result property="office.name" column="office.name" />
 		<result property="name" column="name" />
 		<result property="enname" column="enname" />
 		<result property="roleType" column="roleType" />