Merge branch 'master' of https://github.com/thinkgem/jeesite

farkguidao · Feb 5, 2018 · 4ad385a · 4ad385a
2 parents 533d88c + 348cc76
commit 4ad385a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/thinkgem/jeesite/modules/sys/utils/LogUtils.java b/src/main/java/com/thinkgem/jeesite/modules/sys/utils/LogUtils.java
@@ -26,7 +26,7 @@
 import com.thinkgem.jeesite.modules.sys.entity.User;
 
 /**
- * 字典工具类
+ * 日志工具类
  * @author ThinkGem
  * @version 2014-11-7
  */

diff --git a/src/main/resources/mappings/modules/sys/RoleDao.xml b/src/main/resources/mappings/modules/sys/RoleDao.xml
@@ -4,6 +4,10 @@
 
     <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" />
@@ -201,4 +205,4 @@
 		WHERE id = #{id}
 	</update>
 
-</mapper>
+</mapper>