Routine Update

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

4
DB.sql
View File

@ -1,6 +1,6 @@
/*==============================================================*/
/* 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 */
/*==============================================================*/
create table Role (
Id int not null,
Id int identity,
Name varchar(255) not null default ' ',
Status int not null default 1,
Type int not null default 0,

View File

@ -70,8 +70,10 @@ namespace OpenAuth.App
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)
@ -79,17 +81,16 @@ namespace OpenAuth.App
_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;
_repository.Add(Role);
role.CreateTime = DateTime.Now;
_repository.Add(role);
}
else
{
_repository.Update(Role);
_repository.Update(role);
}
}

View File

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

View File

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

View File

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

View File

@ -12,7 +12,7 @@ namespace OpenAuth.Repository
{
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)
@ -22,7 +22,7 @@ namespace OpenAuth.Repository
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)

View File

@ -14,7 +14,7 @@ namespace OpenAuth.Repository
{
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)
@ -38,7 +38,7 @@ namespace OpenAuth.Repository
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>