diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java
index dbac7d4..6b1150b 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java
@@ -147,6 +147,12 @@ public class Users implements Serializable {
 	@TableField(exist=false)
 	private String dataOrgIds;
 	
+	
+	/**
+     * 角色列表数据权限，逗号分隔
+     */
+    @TableField(exist=false)
+    private String roles;
 
 
 	public String getId() {
@@ -349,6 +355,14 @@ public class Users implements Serializable {
         this.dataOrgIds = dataOrgIds;
     }
 
+    public String getRoles() {
+        return roles;
+    }
+
+    public void setRoles(String roles) {
+        this.roles = roles;
+    }
+
 
 
 }
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java
index 727d7ba..a95f231 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java
@@ -129,14 +129,16 @@ public class UsersServiceImpl extends ServiceImpl<UsersMapper, Users> implements
 
         sysUserDataPermissionsMapper
             .delete(new EntityWrapper<SysUserDataPermissions>().where("USER_ID={0}", user.getId()));
-        String[] dataPermissionArray = user.getDataOrgIds().split(",");
-        if (dataPermissionArray != null && dataPermissionArray.length > 0) {
-            for (String orgid : dataPermissionArray) {
-                SysUserDataPermissions dataEntity = new SysUserDataPermissions();
-                dataEntity.setId(StrUtils.uuid());
-                dataEntity.setOrgId(orgid);
-                dataEntity.setUserId(user.getId());
-                sysUserDataPermissionsMapper.insert(dataEntity);
+        if(StrUtils.isNotEmpty(user.getDataOrgIds())){
+            String[] dataPermissionArray = user.getDataOrgIds().split(",");
+            if (dataPermissionArray != null && dataPermissionArray.length > 0) {
+                for (String orgid : dataPermissionArray) {
+                    SysUserDataPermissions dataEntity = new SysUserDataPermissions();
+                    dataEntity.setId(StrUtils.uuid());
+                    dataEntity.setOrgId(orgid);
+                    dataEntity.setUserId(user.getId());
+                    sysUserDataPermissionsMapper.insert(dataEntity);
+                }
             }
         }
 
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java
index 58cd19a..2041db1 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java
@@ -76,7 +76,7 @@ public class SysUsersController extends BaseController {
 		}
 		String userid = StrUtils.uuid();
 		user.setId(userid);
-		boolean tag = userService.addUser(user, getUserRoleList(userid, getParameter("roles")));
+		boolean tag = userService.addUser(user, getUserRoleList(userid, user.getRoles()));
 		return handleAjaxResult(ajaxResult, tag, OperationName.CREATE);
 	}
 
@@ -153,8 +153,7 @@ public class SysUsersController extends BaseController {
 		// 所有角色数据
 		List<Roles> roleList = sysRolesService.selectList(new EntityWrapper<Roles>().where("ifDel=0"));
 		List<Organizations> orgs = sysOrganizationsService.getAllEnableOrg();
-		
-		model.addAttribute("roleString", toJson(roleList));
+		model.addAttribute("roleList", roleList);
 		model.addAttribute("orgs", orgs);
 		
 		
@@ -179,7 +178,7 @@ public class SysUsersController extends BaseController {
 			ajaxResult.setMessage("修改失败！ " + user.getAccount() + " 已经存在，请修改登录账号！");
 			return ajaxResult;
 		}
-		boolean tag = userService.updateUser(user, getUserRoleList(user.getId(), getParameter("roles")));
+		boolean tag = userService.updateUser(user, getUserRoleList(user.getId(), user.getRoles()));
 		return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE);
 
 	}
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html
index 6a52d4c..8b7875e 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html
@@ -1,115 +1,11 @@
 #override("css")
 <link rel="stylesheet" href="${ctx}/static/js/zTree_v3/css/zTreeStyle/zTreeStyle.css" type="text/css" />
 #end
-#override("js")
-<script src="${ctx}/static/js/zTree_v3/js/jquery.ztree.all-3.5.min.js" type="text/javascript"></script>
-<script type="text/javascript">
-var reNodes = ${roleString};
-</script>
-<script>
-var setting_resource = {
-    check: {
-        enable: true,
-        chkboxType: {
-            'Y': 's',
-            'N': 's'
-        }
-    },
-    view: {
-        dblClickExpand: false
-    },
-    data: {
-        simpleData: {
-            enable: true,
-            idKey: "role_id"
-        }
-    },
-    callback: {
-        beforeClick: beforeClick_resource,
-        onCheck: onCheck_resource
-    }
-};
-function beforeClick_resource(treeId, treeNode) {
-    var zTree = $.fn.zTree.getZTreeObj('tree_resource');
-    zTree.expandNode(treeNode);
-    zTree.checkNode(treeNode, !treeNode.checked, null, true);
-    return false;
-}
-function selectTreeNode_resource(id) {
-    var zTree = $.fn.zTree.getZTreeObj('tree_resource');
-    var node = zTree.getNodeByParam('id', id);
-    var pNode = node.getParentNode();
-    while (pNode != null) {
-        pNode = analParentNode(pNode, zTree);
-    }
-    zTree.cancelSelectedNode();
-    zTree.checkNode(node, true);
-    zTree.selectNode(node, true);
-}
-function analParentNode(node, zTree) {
-    zTree.expandNode(node, true);
-    var pNode = node.getParentNode();
-    if (pNode) {
-        return pNode;
-    }
-    return null;
-}
-function onClick_resource(e, treeId, treeNode) {
-    var zTree = $.fn.zTree.getZTreeObj('tree_resource');
-    zTree.expandNode(treeNode);
-    zTree.checkNode(treeNode, !treeNode.checked, null, true);
-    return false;
-}
-function onCheck_resource(e, treeId, treeNode) {
-    var zTree = $.fn.zTree.getZTreeObj('tree_resource'),
-    nodes = zTree.getCheckedNodes(true),
-    v_txt = '';
-    v_value = '';
-    v_type = '';
-    for (var i = 0,
-    l = nodes.length; i < l; i++) {
-        v_txt += nodes[i].name + ',';
-        v_value += nodes[i].id + ',';
-        if (nodes[i].type) {
-            v_type += nodes[i].type + ',';
-        }
-    }
-    if (v_txt.length > 0) {
-        v_txt = v_txt.substring(0, v_txt.length - 1);
-        v_value = v_value.substring(0, v_value.length - 1);
-        v_type = v_type.substring(0, v_type.length - 1);
-    }
-    $('#resource').attr('value', v_value);
-    $('#resource_txt').attr('value', v_txt);
-    $('#resource_type').attr('value', v_type);
-}
-var zNodes_resource = null;
-var zTree_selectMode_resource = 'all';
-$(function() {
-    zNodes_resource = reNodes;
-    var zTree = $.fn.zTree.init($('#tree_resource'), setting_resource, zNodes_resource);
-    
-    //初始化勾选
-    var rpValues = $('#resource').val();
-    if(rpValues.length > 0){
-		var rpArray = rpValues.split(",");
-		for(var i = 0 ; i < rpArray.length ;i++){
-			var node = zTree.getNodeByParam('id',rpArray[i]);
-			if(node != null){
-				zTree.checkNode(node,true,true);
-			}
-		}
-    }
-});
-
-</script>
-#end
 #override("body")
 <div class="ibox float-e-margins">
+	<form id="validForm" class="form-horizontal m-t" novalidate="novalidate">
     <div class="ibox-content">
     	<div class="col-sm-4">
-	        <form id="validForm" class="form-horizontal m-t" novalidate="novalidate">
-	        	<input id="resource" name="roles" type="hidden" value="$!userRoles"/>
 	        	<input type="hidden" id="user.id" name="id" value="$!user.id"/>
 	            <div class="form-group">
 	                <label class="col-sm-3 control-label">账号：</label>
@@ -180,10 +76,6 @@ $(function() {
 	                </div>
 	            </div>
 	            <div class="form-group">
-	                <label class="col-sm-3 control-label">医院权限列表:</label>
-	                #selector("dataOrgIds" "dataOrgIds" $orgs "${dataOrgids}" true)
-	            </div>
-	            <div class="form-group">
 	            </div>
 	            <div class="hr-line-dashed"></div>
 	            <div class="form-group">
@@ -192,14 +84,20 @@ $(function() {
 	                    <button type="button" class="btn btn-white" onclick="parent.closeAll();"><i class="fa fa-close"></i>&nbsp;取消</button>
 	                </div>
 	            </div>
-	        </form>
 		</div>
 		<div class="col-sm-6">
-		  <div id="treeContent_resource" class="menuContent"> 
-		   	<ul id="tree_resource" class="ztree" style="margin-top:0; width:180px; height: 250px;"></ul>
-		  </div>
+			<label class="col-sm-3 control-label">医院权限列表:</label>
+            #selector("dataOrgIds" "dataOrgIds" $orgs "${dataOrgids}" true)
+        </div>
+        <div class="col-sm-6">
+        	<br/><br/><br/>
+        </div>
+        <div class="col-sm-6">
+			<label class="col-sm-3 control-label">用户角色列表:</label>
+            #selector("roles" "roles" $roleList "$!userRoles" true)
         </div>
     </div>
+    </form>
 </div>
 <script type="text/javascript">
 	function search(){