From f64546f260e8a1d8d4a98e284a27946a2daf6d2a Mon Sep 17 00:00:00 2001
From: ping199143 <89768641@qq.com>
Date: Thu, 22 Feb 2018 14:20:02 +0800
Subject: [PATCH] =?UTF-8?q?association=E6=A0=87=E7=AD=BE=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E2=80=9CThe=20content=20of?=
 =?UTF-8?q?=20element=20type=20"resultMap"=20must=20match=20"(constructor?=
 =?UTF-8?q?=3F,id*,result*,association*,collection*,discriminator=3F)".?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mappings/modules/sys/RoleDao.xml b/src/main/resources/mappings/modules/sys/RoleDao.xml
index 5e28cb7e4..e46aa4bef 100644
--- a/src/main/resources/mappings/modules/sys/RoleDao.xml
+++ b/src/main/resources/mappings/modules/sys/RoleDao.xml
@@ -4,17 +4,17 @@
     
     <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" />
 		<result property="dataScope" column="dataScope" />
 		<result property="remarks" column="remarks" />
 		<result property="useable" column="useable" />
-		<result property="sysData" column="sysData" /><!-- 
+		<result property="sysData" column="sysData" />
+		<association property="office" javaType="Office">
+            <id property="id" column="office.id"/>
+            <id property="name" column="office.name"/>
+        </association><!-- 
 		<collection property="userList" ofType="User">
 			<id property="id" column="userList.id" />
 			<id property="loginName" column="userList.loginName" />
-- 
Gitee