From 1a6e2b3d037116ed91a37ed775d6e32f65c88925 Mon Sep 17 00:00:00 2001
From: JunqiangYang <junqiang.yang.it@gmail.com>
Date: Thu, 22 Feb 2018 19:05:34 +0800
Subject: [PATCH] Update RoleDao.xml

type "resultMap" must match "(constructor?,id*,result*,association*,collection*,discriminator?)
---
 src/main/resources/mappings/modules/sys/RoleDao.xml | 10 ++++++----
 1 file changed, 6 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..e8ec02acaa 100644
--- a/src/main/resources/mappings/modules/sys/RoleDao.xml
+++ b/src/main/resources/mappings/modules/sys/RoleDao.xml
@@ -4,10 +4,7 @@
     
     <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="name" column="name" />
 		<result property="enname" column="enname" />
 		<result property="roleType" column="roleType" />
@@ -25,6 +22,11 @@
 			<id property="office.name" column="userList.office.name" />
 			<id property="company.name" column="userList.company.name" />
 		</collection> -->
+	    	<association property="office" javaType="Office">
+			<id property="id" column="office.id" />
+			<id property="name" column="office.name" />
+		</association>
+	    
 		<collection property="menuList" ofType="Menu">
 			<id property="id" column="menuList.id" />
 		</collection>