diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
index 89f82f2..b6f8ba0 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
@@ -1,8 +1,11 @@
 package com.tamguo.modules.sys.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.tamguo.modules.sys.model.SysUserEntity;
+import com.tamguo.modules.sys.model.SysUserRoleEntity;
 import com.tamguo.modules.sys.model.condition.SysUserCondition;
 
 public interface ISysUserService extends IService<SysUserEntity>{
@@ -25,4 +28,7 @@ public interface ISysUserService extends IService<SysUserEntity>{
 
 	/** 分配角色*/
 	public void allowUserRole(SysUserEntity user);
+	
+	/** 获取用户角色*/
+	public List<SysUserRoleEntity> findUserRole(String userCode);
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
index 33fd9cd..0fa9a14 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
@@ -166,4 +166,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	@Transactional(readOnly=true)
+	@Override
+	public List<SysUserRoleEntity> findUserRole(String userCode) {
+		return sysUserRoleMapper.selectList(Condition.create().eq("user_code", userCode));
+	}
+
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
index 1ae6f5a..8facc40 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
@@ -55,6 +55,7 @@ public class SysUserController {
 	public ModelAndView role(String userCode , ModelAndView model) {
 		model.setViewName(USER_ROLE_PAGE);
 		model.addObject("user", iSysUserService.selectById(userCode));
+		model.addObject("userRoleList", iSysUserService.findUserRole(userCode));
 		return model;
 	}
 	
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/user/role.html b/tamguo-oms/src/main/resources/templates/modules/sys/user/role.html
index 9737e4a..107cd4d 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/user/role.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/user/role.html
@@ -84,7 +84,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 <script th:src="${setting.domain + 'common/jeesite.js'}"></script>
 <script th:src="${setting.domain + 'common/i18n/jeesite_zh_CN.js'}"></script>
 <script th:src="${setting.domain + 'common/common.js'}"></script>
-<script>
+<script type="text/javascript" th:inline="javascript">
 $("#inputForm").validate({
 	submitHandler: function(form){
 		// 获取选中角色
@@ -99,6 +99,7 @@ $("#inputForm").validate({
 		}, "json");
     }
 });
+var userRoleList = [[${userRoleList}]];
 // 加载角色列表
 var roleGrid = $("#roleGrid").dataGrid({
 	url: ctx + 'sys/role/treeData',
@@ -118,7 +119,9 @@ var roleGrid = $("#roleGrid").dataGrid({
 		return $('#inputForm .box-body').width()-20;
 	},
 	ajaxSuccess: function(){
- 		roleGrid.dataGrid('setSelectRow', 'dept');
+		for(var i=0 ; i<userRoleList.length ; i++){
+			roleGrid.dataGrid('setSelectRow', userRoleList[i].roleCode);
+		}
 	}
 });
 </script>
\ No newline at end of file