diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/moon/style.css b/ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/moon/style.css
index d3a3a56e8..2a672c8a9 100644
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/moon/style.css
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/layer/theme/moon/style.css
@@ -119,9 +119,9 @@ body .layer-ext-moon .layui-layer-btn .layui-layer-btn1 {
 	border-radius: 3px;
 }
 body .layer-ext-moon .layui-layer-btn .layui-layer-btn2 {
-	background: #f60;
-	color: #fff;
-	border: 1px solid #f60;
+	background: #fff;
+	color: #404a58;
+	border: 1px solid #c0c4cd;
 	border-radius: 3px;
 }
 body .layer-ext-moon .layui-layer-btn .layui-layer-btn3 {
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index 017497763..fbe02be1d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -232,10 +232,17 @@
         	var treeId = $("#treeId").val();
         	var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
         	var url = ctx + "system/user/selectDeptTree/" + deptId;
+            var btn = ['<i class="fa fa-check"></i> 确认', '<i class="fa fa-trash-o"></i> 清除', '<i class="fa fa-close"></i> 关闭'];
 			var options = {
 				title: '选择部门',
 				width: "380",
 				url: url,
+				btn: btn,
+				btn2: function(index, layero) {
+				    $("#treeId").val("");
+				    $("#treeName").val("");
+				    $.modal.close(index);
+				},
 				callBack: doSubmit
 			};
 			$.modal.openOptions(options);
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
index 74cc8d4f0..2c1627223 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -198,10 +198,17 @@
         function selectDeptTree() {
         	var deptId = $.common.isEmpty($("#treeId").val()) ? "100" : $("#treeId").val();
             var url = ctx + "system/user/selectDeptTree/" + deptId;
+            var btn = ['<i class="fa fa-check"></i> 确认', '<i class="fa fa-trash-o"></i> 清除', '<i class="fa fa-close"></i> 关闭'];
 		    var options = {
 				title: '选择部门',
 				width: "380",
 				url: url,
+				btn: btn,
+				btn2: function(index, layero) {
+				    $("#treeId").val("");
+				    $("#treeName").val("");
+				    $.modal.close(index);
+				},
 				callBack: doSubmit
 			};
 			$.modal.openOptions(options);
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index e3935f320..00afe256b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -173,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	<update id="updateUser" parameterType="SysUser">
  		update sys_user
  		<set>
- 			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+ 			<if test="deptId != 0">dept_id = #{deptId},</if>
  			<if test="userName != null and userName != ''">user_name = #{userName},</if>
  			<if test="userType != null and userType != ''">user_type = #{userType},</if>
  			<if test="email != null and email != ''">email = #{email},</if>