From 74ffd4ac28e2512f7b542ca9f9925ca4e48137ab Mon Sep 17 00:00:00 2001
From: JeremyKing <jgroups@163.com>
Date: Mon, 17 Oct 2016 16:48:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E5=BD=92=E5=B1=9E=E6=9C=BA=E6=9E=84=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?Bug?=
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, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mappings/modules/sys/RoleDao.xml b/src/main/resources/mappings/modules/sys/RoleDao.xml
index 45b5c1d4d7..5e28cb7e44 100644
--- 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>
\ No newline at end of file
+</mapper>

From fe619f15f9516878ac8e7f347c8e5b85267b91a8 Mon Sep 17 00:00:00 2001
From: JeremyKing <jgroups@163.com>
Date: Thu, 27 Jul 2017 18:40:25 +0800
Subject: [PATCH 2/2] Update LogUtils.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改日志工具类注释
---
 .../java/com/thinkgem/jeesite/modules/sys/utils/LogUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 11137efc91..acbc5c295f 100644
--- 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
  */