diff --git a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs b/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs
index 019bf5d..61ea218 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs
@@ -155,11 +155,11 @@ namespace ZR.Admin.WebApi.Controllers.System
             {
                 return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"存在下级部门，不允许删除"));
             }
-            if (UserService.Queryable().Count(it => it.DeptId == deptId && it.DelFlag == "0") > 0)
+            if (UserService.Queryable().Count(it => it.DeptId == deptId && it.DelFlag == 0) > 0)
             {
                 return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"部门存在用户，不允许删除"));
             }
-            
+
             return SUCCESS(DeptService.Delete(deptId));
         }
     }
diff --git a/ZR.Admin.WebApi/Extensions/DbExtension.cs b/ZR.Admin.WebApi/Extensions/DbExtension.cs
index 6be1328..1e6582f 100644
--- a/ZR.Admin.WebApi/Extensions/DbExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/DbExtension.cs
@@ -114,12 +114,12 @@ namespace ZR.Admin.WebApi.Extensions
         public static void InitDb(this IServiceProvider service)
         {
             var db = DbScoped.SugarScope;
-            db.DbMaintenance.CreateDatabase();
-            //db.CodeFirst.
+            //建库：如果不存在创建数据库存在不会重复创建 
+            db.DbMaintenance.CreateDatabase();// 注意 ：Oracle和个别国产库需不支持该方法，需要手动建库 
 
             var baseType = typeof(SysBase);
             var entityes = AssemblyUtils.GetAllTypes().Where(p => !p.IsAbstract && p != baseType && /*p.IsAssignableTo(baseType) && */p.GetCustomAttribute<SugarTable>() != null).ToArray();
-            db.CodeFirst.SetStringDefaultLength(512).InitTables(entityes);
+            db.CodeFirst.SetStringDefaultLength(200).InitTables(entityes);
         }
 
         private static object GetParsValue(SugarParameter x)
@@ -147,7 +147,7 @@ namespace ZR.Admin.WebApi.Extensions
             var db = DbScoped.SugarScope.GetConnectionScope(configId);
             foreach (var role in user.Roles.OrderBy(f => f.DataScope))
             {
-                string dataScope = role.DataScope;
+                string dataScope = role.DataScope.ToString();
                 if (DATA_SCOPE_ALL.Equals(dataScope))//所有权限
                 {
                     break;
diff --git a/ZR.Model/System/SysBase.cs b/ZR.Model/System/SysBase.cs
index 21ea490..9750ab4 100644
--- a/ZR.Model/System/SysBase.cs
+++ b/ZR.Model/System/SysBase.cs
@@ -8,7 +8,7 @@ namespace ZR.Model.System
     //[EpplusTable(PrintHeaders = true, AutofitColumns = true, AutoCalculate = true, ShowTotal = true)]
     public class SysBase
     {
-        [SugarColumn(IsOnlyIgnoreUpdate = true)]
+        [SugarColumn(IsOnlyIgnoreUpdate = true, Length = 64)]
         [JsonProperty(propertyName: "CreateBy")]
         [ExcelIgnore]
         public string Create_by { get; set; }
@@ -20,7 +20,7 @@ namespace ZR.Model.System
 
         [JsonIgnore]
         [JsonProperty(propertyName: "UpdateBy")]
-        [SugarColumn(IsOnlyIgnoreInsert = true)]
+        [SugarColumn(IsOnlyIgnoreInsert = true, Length = 64)]
         [ExcelIgnore]
         public string Update_by { get; set; }
 
diff --git a/ZR.Model/System/SysRole.cs b/ZR.Model/System/SysRole.cs
index 478b567..f47a890 100644
--- a/ZR.Model/System/SysRole.cs
+++ b/ZR.Model/System/SysRole.cs
@@ -33,17 +33,17 @@ namespace ZR.Model.System
         /// <summary>
         /// 帐号状态（0正常 1停用）
         /// </summary>
-        public string Status { get; set; }
+        public int Status { get; set; }
 
         /// <summary>
         /// 删除标志（0代表存在 2代表删除）
         /// </summary>
         [SugarColumn(IsOnlyIgnoreInsert = true, IsOnlyIgnoreUpdate = true)]
-        public string DelFlag { get; set; }
+        public int DelFlag { get; set; }
         /// <summary>
         /// 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限））
         /// </summary>
-        public string DataScope { get; set; }
+        public int DataScope { get; set; }
         /// <summary>
         /// 菜单树选择项是否关联显示
         /// </summary>
diff --git a/ZR.Model/System/SysUser.cs b/ZR.Model/System/SysUser.cs
index e65c9b7..b6725f1 100644
--- a/ZR.Model/System/SysUser.cs
+++ b/ZR.Model/System/SysUser.cs
@@ -21,21 +21,26 @@ namespace ZR.Model.System
         /// <summary>
         /// 登录用户名
         /// </summary>
+        [SugarColumn(Length = 30, ColumnDescription = "用户账号", ColumnDataType = "varchar")]
         public string UserName { get; set; }
         /// <summary>
         /// 用户昵称
         /// </summary>
+        [SugarColumn(Length = 30, ColumnDescription = "用户昵称", ColumnDataType = "varchar")]
         public string NickName { get; set; }
         /// <summary>
         /// 用户类型（00系统用户）
         /// </summary>
-        public string UserType { get; set; } = "";
+        [SugarColumn(Length = 2, ColumnDescription = "用户类型（00系统用户）", ColumnDataType = "varchar", DefaultValue = "00")]
+        public string UserType { get; set; } = "00";
         //[SugarColumn(IsOnlyIgnoreInsert = true)]
         public string Avatar { get; set; }
+        [SugarColumn(Length = 50, ColumnDescription = "用户邮箱", ColumnDataType = "varchar")]
         public string Email { get; set; }
 
         [JsonIgnore]
         [ExcelIgnore]
+        [SugarColumn(Length = 100, ColumnDescription = "密码", ColumnDataType = "varchar")]
         public string Password { get; set; }
         /// <summary>
         /// 手机号
@@ -44,19 +49,19 @@ namespace ZR.Model.System
         /// <summary>
         /// 用户性别（0男 1女 2未知）
         /// </summary>
-        public string Sex { get; set; }
+        public int Sex { get; set; }
 
         /// <summary>
         /// 帐号状态（0正常 1停用）
         /// </summary>
         [ExcelIgnore]
-        public string Status { get; set; }
+        public int Status { get; set; }
 
         /// <summary>
         /// 删除标志（0代表存在 2代表删除）
         /// </summary>
         [SugarColumn(IsOnlyIgnoreInsert = true)]
-        public string DelFlag { get; set; }
+        public int DelFlag { get; set; }
 
         /// <summary>
         /// 最后登录IP
diff --git a/ZR.Service/System/SysLoginService.cs b/ZR.Service/System/SysLoginService.cs
index 95990ad..ca3f5b9 100644
--- a/ZR.Service/System/SysLoginService.cs
+++ b/ZR.Service/System/SysLoginService.cs
@@ -47,7 +47,7 @@ namespace ZR.Service.System
                 AddLoginInfo(logininfor);
                 throw new CustomException(ResultCode.LOGIN_ERROR ,logininfor.Msg);
             }
-            if (user.Status == "1")
+            if (user.Status == 1)
             {
                 logininfor.Msg = "该用户已禁用";
                 AddLoginInfo(logininfor);
diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs
index 27d6cb9..2b8f41c 100644
--- a/ZR.Service/System/SysMenuService.cs
+++ b/ZR.Service/System/SysMenuService.cs
@@ -205,7 +205,7 @@ namespace ZR.Service
                 JoinType.Left, rm.Role_id == ur.RoleId,
                 JoinType.Left, ur.RoleId == r.RoleId
                 ))
-                .Where((m, rm, ur, r) => m.Status == "0" && r.Status == "0" && ur.UserId == userId)
+                .Where((m, rm, ur, r) => m.Status == "0" && r.Status == 0 && ur.UserId == userId)
                 .Select((m, rm, ur, r) => m).ToList();
             var menuList = menus.Where(f => !string.IsNullOrEmpty(f.Perms));
 
diff --git a/ZR.Service/System/SysRoleService.cs b/ZR.Service/System/SysRoleService.cs
index 57d4d0e..308e1f1 100644
--- a/ZR.Service/System/SysRoleService.cs
+++ b/ZR.Service/System/SysRoleService.cs
@@ -41,9 +41,9 @@ namespace ZR.Service
         public PagedInfo<SysRole> SelectRoleList(SysRole sysRole, PagerInfo pager)
         {
             var exp = Expressionable.Create<SysRole>();
-            exp.And(role => role.DelFlag == "0");
+            exp.And(role => role.DelFlag == 0);
             exp.AndIF(!string.IsNullOrEmpty(sysRole.RoleName), role => role.RoleName.Contains(sysRole.RoleName));
-            exp.AndIF(!string.IsNullOrEmpty(sysRole.Status), role => role.Status == sysRole.Status);
+            exp.AndIF(sysRole.Status != -1, role => role.Status == sysRole.Status);
             exp.AndIF(!string.IsNullOrEmpty(sysRole.RoleKey), role => role.RoleKey == sysRole.RoleKey);
 
             var query = Queryable()
@@ -64,7 +64,7 @@ namespace ZR.Service
         public List<SysRole> SelectRoleAll()
         {
             return Queryable()
-                .Where(role => role.DelFlag == "0")
+                .Where(role => role.DelFlag == 0)
                 .OrderBy(role => role.RoleSort)
                 .ToList();
         }
@@ -77,7 +77,7 @@ namespace ZR.Service
         public List<SysRole> SelectRolePermissionByUserId(long userId)
         {
             return Queryable()
-                .Where(role => role.DelFlag == "0")
+                .Where(role => role.DelFlag == 0)
                 .Where(it => SqlFunc.Subqueryable<SysUserRole>().Where(s => s.UserId == userId).Any())
                 .OrderBy(role => role.RoleSort)
                 .ToList();
@@ -307,7 +307,7 @@ namespace ZR.Service
         /// <returns></returns>
         public List<long> SelectUserRoles(long userId)
         {
-            var list = SelectUserRoleListByUserId(userId).Where(f => f.Status == "0");
+            var list = SelectUserRoleListByUserId(userId).Where(f => f.Status == 0);
 
             return list.Select(x => x.RoleId).ToList();
         }
diff --git a/ZR.Service/System/SysUserRoleService.cs b/ZR.Service/System/SysUserRoleService.cs
index 37139f5..17fb032 100644
--- a/ZR.Service/System/SysUserRoleService.cs
+++ b/ZR.Service/System/SysUserRoleService.cs
@@ -66,7 +66,7 @@ namespace ZR.Service.System
         {
             return Context.Queryable<SysUserRole, SysUser > ((t1, u) => new JoinQueryInfos(
                    JoinType.Left, t1.UserId == u.UserId))
-                 .Where((t1, u) => t1.RoleId == roleId && u.DelFlag == "0")
+                 .Where((t1, u) => t1.RoleId == roleId && u.DelFlag == 0)
                  .Select((t1, u) => u)
                  .ToList();
         }
@@ -80,7 +80,7 @@ namespace ZR.Service.System
         {
             var query = Context.Queryable<SysUserRole, SysUser>((t1, u) => new JoinQueryInfos(
                 JoinType.Left, t1.UserId == u.UserId))
-                .Where((t1, u) => t1.RoleId == roleUserQueryDto.RoleId && u.DelFlag == "0");
+                .Where((t1, u) => t1.RoleId == roleUserQueryDto.RoleId && u.DelFlag == 0);
             if (!string.IsNullOrEmpty(roleUserQueryDto.UserName))
             {
                 query = query.Where((t1, u) => u.UserName.Contains(roleUserQueryDto.UserName));
@@ -96,7 +96,7 @@ namespace ZR.Service.System
         public PagedInfo<SysUser> GetExcludedSysUsersByRoleId(RoleUserQueryDto roleUserQueryDto)
         {
             var query = Context.Queryable<SysUser>()
-                .Where(it => it.DelFlag == "0")
+                .Where(it => it.DelFlag == 0)
                 .Where(it => SqlFunc.Subqueryable<SysUserRole>().Where(s => s.UserId == it.UserId && s.RoleId == roleUserQueryDto.RoleId).NotAny())
                 .WhereIF(roleUserQueryDto.UserName.IsNotEmpty(), it => it.UserName.Contains(roleUserQueryDto.UserName));
 
diff --git a/ZR.Service/System/SysUserService.cs b/ZR.Service/System/SysUserService.cs
index 8fd9229..b96cc0c 100644
--- a/ZR.Service/System/SysUserService.cs
+++ b/ZR.Service/System/SysUserService.cs
@@ -2,6 +2,7 @@ using Infrastructure;
 using Infrastructure.Attribute;
 using Infrastructure.Extensions;
 using SqlSugar;
+using SqlSugar.IOC;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -43,11 +44,11 @@ namespace ZR.Service
         {
             var exp = Expressionable.Create<SysUser>();
             exp.AndIF(!string.IsNullOrEmpty(user.UserName), u => u.UserName.Contains(user.UserName));
-            exp.AndIF(!string.IsNullOrEmpty(user.Status), u => u.Status == user.Status);
+            exp.AndIF(user.Status != -1, u => u.Status == user.Status);
             exp.AndIF(user.BeginTime != DateTime.MinValue && user.BeginTime != null, u => u.Create_time >= user.BeginTime);
             exp.AndIF(user.EndTime != DateTime.MinValue && user.EndTime != null, u => u.Create_time <= user.EndTime);
             exp.AndIF(!user.Phonenumber.IsEmpty(), u => u.Phonenumber == user.Phonenumber);
-            exp.And(u => u.DelFlag == "0");
+            exp.And(u => u.DelFlag == 0);
 
             if (user.DeptId != 0)
             {
@@ -197,7 +198,7 @@ namespace ZR.Service
             UserRoleService.DeleteUserRoleByUserId((int)userid);
             // 删除用户与岗位关联
             UserPostService.Delete(userid);
-            return Update(new SysUser() { UserId = userid, DelFlag = "2" }, it => new { it.DelFlag }, f => f.UserId == userid);
+            return Update(new SysUser() { UserId = userid, DelFlag = 2 }, it => new { it.DelFlag }, f => f.UserId == userid);
         }
 
         /// <summary>
@@ -229,7 +230,7 @@ namespace ZR.Service
                 UserName = dto.Username,
                 NickName = dto.Username,
                 Password = password,
-                Status = "0",
+                Status = 0,
                 DeptId = 0,
                 Remark = "用户注册"
             };
@@ -275,8 +276,8 @@ namespace ZR.Service
             users.ForEach(x =>
             {
                 x.Create_time = DateTime.Now;
-                x.Status = "0";
-                x.DelFlag = "0";
+                x.Status = 0;
+                x.DelFlag = 0;
                 x.Password = "E10ADC3949BA59ABBE56E057F20F883E";
                 x.Remark = x.Remark.IsEmpty() ? "数据导入" : x.Remark;
             });
diff --git a/ZR.Vue/src/views/system/article/manager.vue b/ZR.Vue/src/views/system/article/manager.vue
index 41046a1..118a568 100644
--- a/ZR.Vue/src/views/system/article/manager.vue
+++ b/ZR.Vue/src/views/system/article/manager.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="24">
       <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-      <el-form :model="queryParams" label-position="left" inline ref="queryForm" label-width="100px" v-show="showSearch" @submit.native.prevent>
+      <el-form :model="queryParams" label-position="left" inline ref="queryForm" v-show="showSearch" @submit.native.prevent>
         <el-col :span="6">
           <el-form-item label="文章标题" prop="title">
             <el-input v-model="queryParams.title" placeholder="请输入文章标题" size="small" />
@@ -39,7 +39,8 @@
       <el-table-column prop="content" label="文章内容" :show-overflow-tooltip="true"> </el-table-column>
       <el-table-column sortable prop="status" align="center" label="状态" width="90">
         <template slot-scope="scope">
-          <el-tag size="mini" :type="scope.row.status == '2' ? 'danger' : 'success'" disable-transitions>{{ scope.row.status == '2' ? "草稿":"已发布" }}
+          <el-tag size="mini" :type="scope.row.status == '2' ? 'danger' : 'success'" disable-transitions
+            >{{ scope.row.status == '2' ? '草稿' : '已发布' }}
           </el-tag>
         </template>
       </el-table-column>
@@ -48,16 +49,16 @@
       <el-table-column label="操作" align="center" width="190">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">查看</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:update']">编辑
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:update']"
+            >编辑
           </el-button>
-          <el-popconfirm title="确定删除吗？" @onConfirm="handleDelete(scope.row)" style="margin-left:10px">
+          <el-popconfirm title="确定删除吗？" @onConfirm="handleDelete(scope.row)" style="margin-left: 10px">
             <el-button slot="reference" size="mini" type="text" icon="el-icon-delete" v-hasPermi="['system:article:delete']">删除</el-button>
           </el-popconfirm>
         </template>
       </el-table-column>
     </el-table>
     <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-
   </div>
 </template>
 <script>
@@ -87,8 +88,8 @@ export default {
       total: 0,
       // 提交按钮是否显示
       btnSubmitVisible: true,
-			// 文章预览地址
-			previewUrl: ''
+      // 文章预览地址
+      previewUrl: '',
     }
   },
   created() {
@@ -134,15 +135,15 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$router.push({ path: '/article/publish', query: { cid: row.cid }})
+      this.$router.push({ path: '/article/publish', query: { cid: row.cid } })
     },
     // 详情
     handleView(row) {
-			var link = `${this.previewUrl}${row.cid}`
-			window.open(link)
+      var link = `${this.previewUrl}${row.cid}`
+      window.open(link)
     },
     handleImport() {},
-    handleExport() {}
-  }
+    handleExport() {},
+  },
 }
 </script>
diff --git a/ZR.Vue/src/views/system/role/index.vue b/ZR.Vue/src/views/system/role/index.vue
index ba518b9..984c061 100644
--- a/ZR.Vue/src/views/system/role/index.vue
+++ b/ZR.Vue/src/views/system/role/index.vue
@@ -2,14 +2,21 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
       <el-form-item label="角色名称" prop="roleName">
-        <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable size="small" style="width: 240px"
-          @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.roleName"
+          placeholder="请输入角色名称"
+          clearable
+          size="small"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <!-- <el-form-item label="权限字符" prop="roleKey">
         <el-input v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
       </el-form-item> -->
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="角色状态" clearable size="small" style="width: 240px">
+          <el-option label="全部" :value="-1" />
           <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
         </el-select>
       </el-form-item>
@@ -34,8 +41,13 @@
       <el-table-column label="权限范围" prop="dataScope" :formatter="dataScopeFormat"></el-table-column>
       <el-table-column label="状态" align="center" width="90">
         <template slot-scope="scope">
-          <el-switch v-model="scope.row.status" :disabled="scope.row.roleKey == 'admin'" active-value="0" inactive-value="1"
-            @change="handleStatusChange(scope.row)"></el-switch>
+          <el-switch
+            v-model="scope.row.status"
+            :disabled="scope.row.roleKey == 'admin'"
+            :active-value="0"
+            :inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
         </template>
       </el-table-column>
       <el-table-column label="用户个数" align="center" prop="userNum" width="90" />
@@ -43,17 +55,19 @@
       <el-table-column label="备注" align="center" prop="remark" width="150" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="scope" v-if="scope.row.roleKey != 'admin'">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">修改
+          <el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']"
+            >修改
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click.stop="handleDelete(scope.row)" v-hasPermi="['system:role:remove']">删除
+          <el-button size="mini" type="text" icon="el-icon-delete" @click.stop="handleDelete(scope.row)" v-hasPermi="['system:role:remove']"
+            >删除
           </el-button>
 
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
-            <span class="el-dropdown-link">
-              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-            </span>
+            <span class="el-dropdown-link"> <i class="el-icon-d-arrow-right el-icon--right"></i>更多 </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check" v-hasPermi="['system:role:authorize']">菜单权限</el-dropdown-item>
+              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check" v-hasPermi="['system:role:authorize']"
+                >菜单权限</el-dropdown-item
+              >
               <el-dropdown-item command="handleAuthUser" icon="el-icon-user" v-hasPermi="['system:roleusers:list']">分配用户</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -69,14 +83,23 @@
           <el-input placeholder="请输入关键字进行过滤" v-model="searchText"></el-input>
         </el-form-item>
         <el-form-item label="权限字符">
-          {{form.roleKey}}
+          {{ form.roleKey }}
         </el-form-item>
         <el-form-item label="数据权限">
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
           <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-          <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menu" node-key="id" :check-strictly="!form.menuCheckStrictly"
-            empty-text="加载中，请稍后" :filter-node-method="menuFilterNode" :props="defaultProps"></el-tree>
+          <el-tree
+            class="tree-border"
+            :data="menuOptions"
+            show-checkbox
+            ref="menu"
+            node-key="id"
+            :check-strictly="!form.menuCheckStrictly"
+            empty-text="加载中，请稍后"
+            :filter-node-method="menuFilterNode"
+            :props="defaultProps"
+          ></el-tree>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -107,14 +130,19 @@
           <el-col :lg="12">
             <el-form-item label="数据范围">
               <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-                <el-option v-for="item in dataScopeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                <el-option
+                  v-for="item in dataScopeOptions"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="parseInt(item.dictValue)"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :lg="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
+                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="parseInt(dict.dictValue)">{{ dict.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -123,8 +151,17 @@
               <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
               <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
               <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-              <el-tree class="tree-border" :data="deptOptions" show-checkbox default-expand-all ref="dept" node-key="id"
-                :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候" :props="defaultProps"></el-tree>
+              <el-tree
+                class="tree-border"
+                :data="deptOptions"
+                show-checkbox
+                default-expand-all
+                ref="dept"
+                node-key="id"
+                :check-strictly="!form.deptCheckStrictly"
+                empty-text="加载中，请稍候"
+                :props="defaultProps"
+              ></el-tree>
             </el-form-item>
           </el-col>
           <el-col :lg="24">
@@ -139,28 +176,13 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-import {
-  listRole,
-  getRole,
-  delRole,
-  addRole,
-  updateRole,
-  exportRole,
-  dataScope,
-  changeRoleStatus
-} from '@/api/system/role'
-import {
-  roleMenuTreeselect
-} from '@/api/system/menu'
-import {
-  treeselect as deptTreeselect,
-  roleDeptTreeselect
-} from '@/api/system/dept'
+import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from '@/api/system/role'
+import { roleMenuTreeselect } from '@/api/system/menu'
+import { treeselect as deptTreeselect, roleDeptTreeselect } from '@/api/system/dept'
 
 export default {
   name: 'role',
@@ -200,24 +222,24 @@ export default {
       dataScopeOptions: [
         {
           dictValue: '1',
-          dictLabel: '全部'
+          dictLabel: '全部',
         },
         {
-          dictValue: "2",
-          dictLabel: "自定义",
+          dictValue: '2',
+          dictLabel: '自定义',
         },
         {
           dictValue: '3',
-          dictLabel: '本部门'
+          dictLabel: '本部门',
         },
         {
-          dictValue: "4",
-          dictLabel: "本部门及以下数据权限",
+          dictValue: '4',
+          dictLabel: '本部门及以下数据权限',
         },
         {
           dictValue: '5',
-          dictLabel: '仅本人'
-        }
+          dictLabel: '仅本人',
+        },
       ],
       // 菜单列表
       menuOptions: [],
@@ -229,33 +251,27 @@ export default {
         pageSize: 10,
         roleName: undefined,
         roleKey: undefined,
-        status: undefined
+        status: -1,
       },
       searchText: '',
       // 表单参数
       form: {},
       defaultProps: {
         children: 'children',
-        label: 'label'
+        label: 'label',
       },
       // 表单校验
       rules: {
-        roleName: [
-          { required: true, message: '角色名称不能为空', trigger: 'blur' }
-        ],
-        roleKey: [
-          { required: true, message: '权限字符不能为空', trigger: 'blur' }
-        ],
-        roleSort: [
-          { required: true, message: '角色顺序不能为空', trigger: 'blur' }
-        ]
-      }
+        roleName: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
+        roleKey: [{ required: true, message: '权限字符不能为空', trigger: 'blur' }],
+        roleSort: [{ required: true, message: '角色顺序不能为空', trigger: 'blur' }],
+      },
     }
   },
   watch: {
     searchText(val) {
       this.$refs.menu.filter(val)
-    }
+    },
   },
   created() {
     this.getList()
@@ -268,13 +284,11 @@ export default {
     getList() {
       this.loading = true
 
-      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
-        (response) => {
-          this.roleList = response.data.result
-          this.total = response.data.totalNum
-          this.loading = false
-        }
-      )
+      listRole(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
+        this.roleList = response.data.result
+        this.total = response.data.totalNum
+        this.loading = false
+      })
     },
     /** 查询部门树结构 */
     getDeptTreeselect() {
@@ -310,7 +324,6 @@ export default {
     /** 根据角色ID查询部门树结构 */
     getRoleDeptTreeselect(roleId) {
       return roleDeptTreeselect(roleId).then((response) => {
-        console.log('角色', response)
         this.deptOptions = response.data.depts
         return response
       })
@@ -320,22 +333,18 @@ export default {
       const text = row.status === '0' ? '启用' : '停用'
 
       console.log(JSON.stringify(row), text)
-      this.$confirm(
-        '确认要"' + text + '""' + row.roleName + '"角色吗?',
-        '警告',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      )
-        .then(function() {
+      this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(function () {
           return changeRoleStatus(row.roleId, row.status)
         })
         .then(() => {
           this.msgSuccess(text + '成功')
         })
-        .catch(function() {
+        .catch(function () {
           row.status = row.status === '0' ? '1' : '0'
         })
     },
@@ -350,23 +359,23 @@ export default {
       if (this.$refs.menu != undefined) {
         this.$refs.menu.setCheckedKeys([])
       }
-      (this.menuExpand = false),
-      (this.menuNodeAll = false),
-      (this.deptExpand = true),
-      (this.deptNodeAll = false),
-      (this.form = {
-        roleId: undefined,
-        roleName: undefined,
-        roleKey: undefined,
-        roleSort: 99,
-        status: '0',
-        menuIds: [],
-        deptIds: [],
-        dataScope: '1',
-        menuCheckStrictly: true,
-        deptCheckStrictly: true,
-        remark: undefined
-      })
+      ;(this.menuExpand = false),
+        (this.menuNodeAll = false),
+        (this.deptExpand = true),
+        (this.deptNodeAll = false),
+        (this.form = {
+          roleId: undefined,
+          roleName: undefined,
+          roleKey: undefined,
+          roleSort: 99,
+          status: 0,
+          menuIds: [],
+          deptIds: [],
+          dataScope: 1,
+          menuCheckStrictly: true,
+          deptCheckStrictly: true,
+          remark: undefined,
+        })
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
@@ -494,16 +503,16 @@ export default {
         roleId: row.roleId,
         roleName: row.roleName,
         roleKey: row.roleKey,
-        menuCheckStrictly: row.menuCheckStrictly
+        menuCheckStrictly: row.menuCheckStrictly,
       }
     },
     /** 分配用户操作 */
-    handleAuthUser: function(row) {
+    handleAuthUser: function (row) {
       const roleId = row.roleId
-      this.$router.push({ path: '/system/roleusers', query: { roleId }})
+      this.$router.push({ path: '/system/roleusers', query: { roleId } })
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.roleId != undefined && this.form.roleId > 0) {
@@ -532,7 +541,7 @@ export default {
       })
     },
     /** 提交按钮（菜单数据权限） */
-    submitDataScope: function() {
+    submitDataScope: function () {
       if (this.form.roleId != undefined) {
         this.form.menuIds = this.getMenuAllCheckedKeys()
         dataScope(this.form).then((response) => {
@@ -547,16 +556,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const roleIds = row.roleId || this.ids
-      this.$confirm(
-        '是否确认删除角色编号为"' + roleIds + '"的数据项?',
-        '警告',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      )
-        .then(function() {
+      this.$confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(function () {
           return delRole(roleIds)
         })
         .then(() => {
@@ -570,16 +575,16 @@ export default {
       this.$confirm('是否确认导出所有角色数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
-        .then(function() {
+        .then(function () {
           return exportRole(queryParams)
         })
         .then((response) => {
           this.download(response.data.path)
         })
-    }
-  }
+    },
+  },
 }
 </script>
 <style scoped>
@@ -590,4 +595,4 @@ export default {
   background: #ffffff none;
   border-radius: 4px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/ZR.Vue/src/views/system/user/index.vue b/ZR.Vue/src/views/system/user/index.vue
index c113ed2..bba518c 100644
--- a/ZR.Vue/src/views/system/user/index.vue
+++ b/ZR.Vue/src/views/system/user/index.vue
@@ -50,7 +50,8 @@
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px">
-              <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+              <el-option label="全部" :value="-1" />
+							<el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间">
@@ -104,7 +105,7 @@
           <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />
           <el-table-column label="用户状态" align="center">
             <template slot-scope="scope">
-              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+              <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="160"></el-table-column>
@@ -179,14 +180,14 @@
           <el-col :lg="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择用户性别">
-                <el-option v-for="dict in sexOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
+                <el-option v-for="dict in sexOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="parseInt(dict.dictValue)"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :lg="12">
             <el-form-item label="用户状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
+                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="parseInt(dict.dictValue)">{{ dict.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -194,7 +195,7 @@
         <el-row>
           <el-col :lg="12">
             <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择">
+              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
                 <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1">
                 </el-option>
               </el-select>
@@ -202,7 +203,7 @@
           </el-col>
           <el-col :lg="12">
             <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择" @change="selectRole($event)">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择角色" @change="selectRole($event)">
                 <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1">
                 </el-option>
               </el-select>
@@ -327,7 +328,7 @@ export default {
         pageSize: 10,
         userName: undefined,
         phonenumber: undefined,
-        status: undefined,
+        status: -1,
         deptId: undefined,
       },
       // 列信息
@@ -449,7 +450,7 @@ export default {
         phonenumber: undefined,
         email: undefined,
         sex: undefined,
-        status: '0',
+        status: 0,
         remark: undefined,
         postIds: [],
         roleIds: [],