lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-09-19 10:08:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Routine Update

Browse Source
This commit is contained in:
yubaolee
2015-11-19 22:47:56 +08:00
parent 119948ccb7
commit 4c0c7975c0
7 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DB.sql
View File

@@ -1,6 +1,6 @@
/*==============================================================*/ /*==============================================================*/
/* DBMS name: Microsoft SQL Server 2008 */ /* DBMS name: Microsoft SQL Server 2008 */
/* Created on: 2015/11/19 21:22:16 */ /* Created on: 2015/11/19 21:52:04 */
/*==============================================================*/ /*==============================================================*/
@@ -1152,7 +1152,7 @@ go
/* Table: Role */ /* Table: Role */
/*==============================================================*/ /*==============================================================*/
create table Role ( create table Role (
Id int not null, Id int identity,
Name varchar(255) not null default ' ', Name varchar(255) not null default ' ',
Status int not null default 1, Status int not null default 1,
Type int not null default 0, Type int not null default 0,

17
OpenAuth.App/RoleManagerApp.cs
View File

@@ -70,8 +70,10 @@ namespace OpenAuth.App
public Role Find(int id) public Role Find(int id)
{ {
return _repository.FindSingle(u => u.Id == id); var role = _repository.FindSingle(u => u.Id == id);
if(role == null) role = new Role();
return role;
} }
public void Delete(int id) public void Delete(int id)
@@ -79,17 +81,16 @@ namespace OpenAuth.App
_repository.Delete(id); _repository.Delete(id);
} }
public void AddOrUpdate(Role view) public void AddOrUpdate(Role role)
{ {
Role Role = view; if (role.Id == 0)
if (Role.Id == 0)
{ {
Role.CreateTime = DateTime.Now; role.CreateTime = DateTime.Now;
_repository.Add(Role); _repository.Add(role);
} }
else else
{ {
_repository.Update(Role); _repository.Update(role);
} }
} }

4
OpenAuth.Mvc/Controllers/RoleManagerController.cs
View File

@@ -30,11 +30,11 @@ namespace OpenAuth.Mvc.Controllers
//添加或修改组织 //添加或修改组织
[HttpPost] [HttpPost]
public string Add(Role view) public string Add(Role role)
{ {
try try
{ {
_app.AddOrUpdate(view); _app.AddOrUpdate(role);
} }
catch (Exception ex) catch (Exception ex)

30
OpenAuth.Mvc/Views/RoleManager/Add.cshtml
View File

@@ -27,34 +27,30 @@
<td> <td>
<label for="Status" class="control-label x90">当前状态：</label> <label for="Status" class="control-label x90">当前状态：</label>
<input type="text" name="Status" id="Status" value="@Model.Status" <select name="Status" id="Status" data-toggle="selectpicker" data-rule="required">
data-rule="required" size="20"> <option value="0">正常</option>
<option value="1">禁用</option>
</select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="Type" class="control-label x90">角色类型：</label> <label for="Type" class="control-label x90">角色类型：</label>
<input type="text" name="Type" id="Type" value="@Model.Type" <select name="Type" id="Type" data-toggle="selectpicker" data-rule="required">
data-rule="required" size="20"> <option value="0">管理员</option>
</td> <option value="1">普通用户</option>
</tr> </select>
<tr>
<td>
<label for="CreateId" class="control-label x90">创建人ID：</label>
<input type="text" name="CreateId" id="CreateId" value="@Model.CreateId"
data-rule="required" size="20">
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="OrgName" class="control-label x90">所属机构：</label> <label for="OrgName" class="control-label x90">所属机构：</label>
<input id="OrgId" name="OrgId" value="" style="display: none" /> <input id="OrgId" name="OrgId" value="" style="display: none" />
<input type="text" name="OrgName" id="OrgName" <input type="text" name="OrgName" id="OrgName"
data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value=""> data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value="@Model.OrgName">
<ul id="j_select_tree1" class="ztree hide" data-toggle="ztree"></ul> <ul id="j_select_tree1" class="ztree hide" data-toggle="ztree"></ul>
</td> </td>
</tr> </tr>
@@ -80,8 +76,8 @@
}, },
check: { check: {
enable: true, enable: true,
chkStyle: "checkbox", chkStyle: "radio",
chkboxType: { "Y": "", "N": "" } //去掉勾选时级联 radioType: "all"
}, },
data: { data: {
key: { key: {
@@ -122,7 +118,7 @@
var $from = $('#' + treeId).data('fromObj'); var $from = $('#' + treeId).data('fromObj');
if ($from && $from.length) $from.val(names); if ($from && $from.length) $from.val(names);
$('#OrganizationIds').val(ids); $('#OrgId').val(ids);
} }
function zTreeOnClick(event, treeId, treeNode) { function zTreeOnClick(event, treeId, treeNode) {
var zTree = $.fn.zTree.getZTreeObj(treeId); var zTree = $.fn.zTree.getZTreeObj(treeId);

37
OpenAuth.Mvc/Views/RoleManager/Index.cshtml
View File

@@ -45,41 +45,44 @@
}, },
{ {
name: 'Name', name: 'Name',
label: '角色名称' label: '角色名称',
width:100
}, },
{ {
name: 'Status', name: 'Status',
label: '当前状态' label: '当前状态',
type: 'select',
align: 'center',
items:[{'0':'正常'}],
width:50
}, },
{ {
name: 'Type', name: 'Type',
label: '角色类型' label: '角色类型',
type: 'select',
align: 'center',
items: [{ '0': '管理员' }],
width:50
}, },
{ {
name: 'CreateTime', name: 'CreateTime',
label: '创建时间' label: '创建时间'
, type: 'date', , type: 'date',
width: 180, width: 150,
pattern: 'yyyy-MM-dd HH:mm:ss' pattern: 'yyyy-MM-dd HH:mm:ss'
}, },
{
name: 'CreateId',
label: '创建人ID'
},
{
name: 'OrgId',
label: '所属部门流水号'
},
{ {
name: 'OrgCascadeId', name: 'OrgCascadeId',
label: '所属部门节点语义ID' label: '所属部门节点语义ID',
width:100
}, },
{ {
name: 'OrgName', name: 'OrgName',
label: '所属部门名称' label: '所属部门名称',
}, width:100
}
], ],
// data: data,
dataUrl: 'RoleManager/Load?orgId=' + selectedId, dataUrl: 'RoleManager/Load?orgId=' + selectedId,
delUrl: 'Role/Delete', delUrl: 'Role/Delete',
delPK: "Id", delPK: "Id",

4
OpenAuth.Repository/RoleRepository.cs
View File

@@ -12,7 +12,7 @@ namespace OpenAuth.Repository
{ {
public IEnumerable<Role> LoadRoles(int pageindex, int pagesize) public IEnumerable<Role> LoadRoles(int pageindex, int pagesize)
{ {
return Context.Roles.OrderBy(u => u.Name).Skip((pageindex - 1) * pagesize).Take(pagesize); return Context.Roles.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
} }
public int GetRoleCntInOrgs(params int[] orgIds) public int GetRoleCntInOrgs(params int[] orgIds)
@@ -22,7 +22,7 @@ namespace OpenAuth.Repository
public IEnumerable<Role> LoadInOrgs(int pageindex, int pagesize, params int[] orgIds) public IEnumerable<Role> LoadInOrgs(int pageindex, int pagesize, params int[] orgIds)
{ {
return LoadInOrgs(orgIds).OrderBy(u => u.Name).Skip((pageindex - 1) * pagesize).Take(pagesize); return LoadInOrgs(orgIds).OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
} }
public void Delete(int id) public void Delete(int id)

4
OpenAuth.Repository/UserRepository.cs
View File

@@ -14,7 +14,7 @@ namespace OpenAuth.Repository
{ {
public IEnumerable<User> LoadUsers(int pageindex, int pagesize) public IEnumerable<User> LoadUsers(int pageindex, int pagesize)
{ {
return Context.Users.OrderBy(u => u.Name).Skip((pageindex - 1) * pagesize).Take(pagesize); return Context.Users.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
} }
public IEnumerable<User> LoadInOrgs(params int[] orgId) public IEnumerable<User> LoadInOrgs(params int[] orgId)
@@ -38,7 +38,7 @@ namespace OpenAuth.Repository
public IEnumerable<User> LoadInOrgs(int pageindex, int pagesize, params int[] orgIds) public IEnumerable<User> LoadInOrgs(int pageindex, int pagesize, params int[] orgIds)
{ {
return LoadInOrgs(orgIds).OrderBy(u =>u.Name).Skip((pageindex -1)*pagesize).Take(pagesize); return LoadInOrgs(orgIds).OrderBy(u =>u.Id).Skip((pageindex -1)*pagesize).Take(pagesize);
} }
/// <summary> /// <summary>