diff --git a/DB.sql b/DB.sql index d376cb94..ea0cb620 100644 --- a/DB.sql +++ b/DB.sql @@ -1,6 +1,6 @@ /*==============================================================*/ /* DBMS name: Microsoft SQL Server 2008 */ -/* Created on: 2015/11/15 23:04:57 */ +/* Created on: 2015/11/19 21:22:16 */ /*==============================================================*/ @@ -402,7 +402,7 @@ end select @CurrentUser = user_name() execute sp_addextendedproperty 'MS_Description', - '模块元素表', + '模块元素表(需要权限控制的按钮)', 'user', @CurrentUser, 'table', 'ModuleElement' go @@ -497,7 +497,7 @@ end select @CurrentUser = user_name() execute sp_addextendedproperty 'MS_Description', - '所属功能模块流水号', + '功能模块Id', 'user', @CurrentUser, 'table', 'ModuleElement', 'column', 'ModuleId' go @@ -587,7 +587,7 @@ end select @CurrentUser = user_name() execute sp_addextendedproperty 'MS_Description', - '页面元素流水号', + '元素流水号', 'user', @CurrentUser, 'table', 'ModuleElementGrant', 'column', 'ElementId' go @@ -777,6 +777,25 @@ execute sp_addextendedproperty 'MS_Description', 'user', @CurrentUser, 'table', 'ModuleRole', 'column', 'OperateTime' go +if exists(select 1 from sys.extended_properties p where + p.major_id = object_id('ModuleRole') + and p.minor_id = (select c.column_id from sys.columns c where c.object_id = p.major_id and c.name = 'OperatorId') +) +begin + declare @CurrentUser sysname +select @CurrentUser = user_name() +execute sp_dropextendedproperty 'MS_Description', + 'user', @CurrentUser, 'table', 'ModuleRole', 'column', 'OperatorId' + +end + + +select @CurrentUser = user_name() +execute sp_addextendedproperty 'MS_Description', + '授权人流水号', + 'user', @CurrentUser, 'table', 'ModuleRole', 'column', 'OperatorId' +go + alter table ModuleRole add constraint PK_MODULEROLE primary key (Id) go @@ -1133,14 +1152,15 @@ go /* Table: Role */ /*==============================================================*/ create table Role ( - Id int identity, + Id int not null, Name varchar(255) not null default ' ', Status int not null default 1, Type int not null default 0, CreateTime datetime not null default getdate(), CreateId varchar(64) not null default ' ', - CreateOrgId int not null default 0, - CreateOrgCascadeId varchar(255) not null default ' ' + OrgId int not null default 0, + OrgCascadeId varchar(255) not null default ' ', + OrgName varchar(255) not null default ' ' ) go @@ -1277,40 +1297,59 @@ go if exists(select 1 from sys.extended_properties p where p.major_id = object_id('Role') - and p.minor_id = (select c.column_id from sys.columns c where c.object_id = p.major_id and c.name = 'CreateOrgId') + and p.minor_id = (select c.column_id from sys.columns c where c.object_id = p.major_id and c.name = 'OrgId') ) begin declare @CurrentUser sysname select @CurrentUser = user_name() execute sp_dropextendedproperty 'MS_Description', - 'user', @CurrentUser, 'table', 'Role', 'column', 'CreateOrgId' + 'user', @CurrentUser, 'table', 'Role', 'column', 'OrgId' end select @CurrentUser = user_name() execute sp_addextendedproperty 'MS_Description', - '创建人所属部门流水号', - 'user', @CurrentUser, 'table', 'Role', 'column', 'CreateOrgId' + '所属部门流水号', + 'user', @CurrentUser, 'table', 'Role', 'column', 'OrgId' go if exists(select 1 from sys.extended_properties p where p.major_id = object_id('Role') - and p.minor_id = (select c.column_id from sys.columns c where c.object_id = p.major_id and c.name = 'CreateOrgCascadeId') + and p.minor_id = (select c.column_id from sys.columns c where c.object_id = p.major_id and c.name = 'OrgCascadeId') ) begin declare @CurrentUser sysname select @CurrentUser = user_name() execute sp_dropextendedproperty 'MS_Description', - 'user', @CurrentUser, 'table', 'Role', 'column', 'CreateOrgCascadeId' + 'user', @CurrentUser, 'table', 'Role', 'column', 'OrgCascadeId' end select @CurrentUser = user_name() execute sp_addextendedproperty 'MS_Description', - '创建人所属部门节点语义ID', - 'user', @CurrentUser, 'table', 'Role', 'column', 'CreateOrgCascadeId' + '所属部门节点语义ID', + 'user', @CurrentUser, 'table', 'Role', 'column', 'OrgCascadeId' +go + +if exists(select 1 from sys.extended_properties p where + p.major_id = object_id('Role') + and p.minor_id = (select c.column_id from sys.columns c where c.object_id = p.major_id and c.name = 'OrgName') +) +begin + declare @CurrentUser sysname +select @CurrentUser = user_name() +execute sp_dropextendedproperty 'MS_Description', + 'user', @CurrentUser, 'table', 'Role', 'column', 'OrgName' + +end + + +select @CurrentUser = user_name() +execute sp_addextendedproperty 'MS_Description', + '所属部门名称', + 'user', @CurrentUser, 'table', 'Role', 'column', 'OrgName' go alter table Role @@ -2217,6 +2256,25 @@ execute sp_addextendedproperty 'MS_Description', 'user', @CurrentUser, 'table', 'UserOrg', 'column', 'Id' go +if exists(select 1 from sys.extended_properties p where + p.major_id = object_id('UserOrg') + and p.minor_id = (select c.column_id from sys.columns c where c.object_id = p.major_id and c.name = 'OrgId') +) +begin + declare @CurrentUser sysname +select @CurrentUser = user_name() +execute sp_dropextendedproperty 'MS_Description', + 'user', @CurrentUser, 'table', 'UserOrg', 'column', 'OrgId' + +end + + +select @CurrentUser = user_name() +execute sp_addextendedproperty 'MS_Description', + '部门流水号', + 'user', @CurrentUser, 'table', 'UserOrg', 'column', 'OrgId' +go + if exists(select 1 from sys.extended_properties p where p.major_id = object_id('UserOrg') and p.minor_id = (select c.column_id from sys.columns c where c.object_id = p.major_id and c.name = 'UserId') @@ -2326,6 +2384,25 @@ execute sp_addextendedproperty 'MS_Description', 'user', @CurrentUser, 'table', 'UserRole', 'column', 'Id' go +if exists(select 1 from sys.extended_properties p where + p.major_id = object_id('UserRole') + and p.minor_id = (select c.column_id from sys.columns c where c.object_id = p.major_id and c.name = 'RoleId') +) +begin + declare @CurrentUser sysname +select @CurrentUser = user_name() +execute sp_dropextendedproperty 'MS_Description', + 'user', @CurrentUser, 'table', 'UserRole', 'column', 'RoleId' + +end + + +select @CurrentUser = user_name() +execute sp_addextendedproperty 'MS_Description', + '角色ID', + 'user', @CurrentUser, 'table', 'UserRole', 'column', 'RoleId' +go + if exists(select 1 from sys.extended_properties p where p.major_id = object_id('UserRole') and p.minor_id = (select c.column_id from sys.columns c where c.object_id = p.major_id and c.name = 'UserId') @@ -2386,3 +2463,4 @@ go alter table UserRole add constraint PK_USERROLE primary key (Id) go + diff --git a/OpenAuth.App/OpenAuth.App.csproj b/OpenAuth.App/OpenAuth.App.csproj index ec597091..747864a9 100644 --- a/OpenAuth.App/OpenAuth.App.csproj +++ b/OpenAuth.App/OpenAuth.App.csproj @@ -44,6 +44,7 @@ + diff --git a/OpenAuth.App/RoleManagerApp.cs b/OpenAuth.App/RoleManagerApp.cs new file mode 100644 index 00000000..763ff70f --- /dev/null +++ b/OpenAuth.App/RoleManagerApp.cs @@ -0,0 +1,99 @@ +using OpenAuth.App.ViewModel; +using OpenAuth.Domain; +using OpenAuth.Domain.Interface; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace OpenAuth.App +{ + public class RoleManagerApp + { + private IRoleRepository _repository; + private IOrgRepository _orgRepository; + + public RoleManagerApp(IRoleRepository repository, + IOrgRepository orgRepository) + { + _repository = repository; + _orgRepository = orgRepository; + } + + public int GetRoleCntInOrg(int orgId) + { + if (orgId == 0) + { + return _repository.Find(null).Count(); + } + else + { + return _repository.GetRoleCntInOrgs(GetSubOrgIds(orgId)); + } + } + + /// + /// 鍔犺浇涓涓儴闂ㄥ強瀛愰儴闂ㄥ叏閮≧oles + /// + public dynamic Load(int orgId, int pageindex, int pagesize) + { + IEnumerable roles; + int total = 0; + if (orgId == 0) + { + roles = _repository.LoadRoles(pageindex, pagesize); + total = _repository.GetCount(); + } + else + { + roles = _repository.LoadInOrgs(pageindex, pagesize,GetSubOrgIds(orgId)); + total = _repository.GetRoleCntInOrgs(orgId); + } + + + return new + { + total = total, + list = roles, + pageCurrent = pageindex + }; + } + + /// + /// 鑾峰彇褰撳墠缁勭粐鐨勬墍鏈変笅绾х粍缁 + /// + private int[] GetSubOrgIds(int orgId) + { + var org = _orgRepository.FindSingle(u => u.Id == orgId); + var orgs = _orgRepository.Find(u => u.CascadeId.Contains(org.CascadeId)).Select(u => u.Id).ToArray(); + return orgs; + } + + public Role Find(int id) + { + return _repository.FindSingle(u => u.Id == id); + + } + + public void Delete(int id) + { + _repository.Delete(id); + } + + public void AddOrUpdate(Role view) + { + Role Role = view; + if (Role.Id == 0) + { + Role.CreateTime = DateTime.Now; + _repository.Add(Role); + } + else + { + _repository.Update(Role); + } + + } + + + } +} \ No newline at end of file diff --git a/OpenAuth.App/ViewModel/UserView.cs b/OpenAuth.App/ViewModel/UserView.cs index 29a63bb0..95446851 100644 --- a/OpenAuth.App/ViewModel/UserView.cs +++ b/OpenAuth.App/ViewModel/UserView.cs @@ -1,82 +1,82 @@ -锘縰sing System; -using System.Collections.Generic; -using Infrastructure; -using OpenAuth.Domain; - -namespace OpenAuth.App.ViewModel -{ - public class UserView - { - /// - /// 鐢ㄦ埛ID - /// - /// - public int Id { get; set; } - - - /// - /// - /// - public string Account { get; set; } - - - /// - /// 缁勭粐鍚嶇О - /// - /// - public string Name { get; set; } - - - /// - /// - /// - public int Sex { get; set; } - - - /// - /// 褰撳墠鐘舵 - /// - /// - public int Status { get; set; } - - - /// - /// 缁勭粐绫诲瀷 - /// - /// - public int Type { get; set; } - - - - /// - /// 鍒涘缓鏃堕棿 - /// - /// - public DateTime CreateTime { get; set; } - - - /// - /// 鍒涘缓浜哄悕瀛 - /// - /// The create user. - public string CreateUser { get; set; } - - /// - /// 鎵灞炵粍缁囧悕绉帮紝澶氫釜鍙敤锛屽垎闅 - /// - /// The organizations. - public string Organizations { get; set; } - - public string OrganizationIds { get; set; } - - public static implicit operator UserView(User user) - { - return AutoMapperExt.ConvertTo(user); - } - - public static implicit operator User(UserView view) - { - return AutoMapperExt.ConvertTo(view); - } - } -} +锘縰sing System; +using System.Collections.Generic; +using Infrastructure; +using OpenAuth.Domain; + +namespace OpenAuth.App.ViewModel +{ + public class UserView + { + /// + /// 鐢ㄦ埛ID + /// + /// + public int Id { get; set; } + + + /// + /// + /// + public string Account { get; set; } + + + /// + /// 缁勭粐鍚嶇О + /// + /// + public string Name { get; set; } + + + /// + /// + /// + public int Sex { get; set; } + + + /// + /// 褰撳墠鐘舵 + /// + /// + public int Status { get; set; } + + + /// + /// 缁勭粐绫诲瀷 + /// + /// + public int Type { get; set; } + + + + /// + /// 鍒涘缓鏃堕棿 + /// + /// + public DateTime CreateTime { get; set; } + + + /// + /// 鍒涘缓浜哄悕瀛 + /// + /// The create user. + public string CreateUser { get; set; } + + /// + /// 鎵灞炵粍缁囧悕绉帮紝澶氫釜鍙敤锛屽垎闅 + /// + /// The organizations. + public string Organizations { get; set; } + + public string OrganizationIds { get; set; } + + public static implicit operator UserView(User user) + { + return AutoMapperExt.ConvertTo(user); + } + + public static implicit operator User(UserView view) + { + return AutoMapperExt.ConvertTo(view); + } + } +} diff --git a/OpenAuth.Domain/Interface/IRoleRepository.cs b/OpenAuth.Domain/Interface/IRoleRepository.cs new file mode 100644 index 00000000..4e8c7bf6 --- /dev/null +++ b/OpenAuth.Domain/Interface/IRoleRepository.cs @@ -0,0 +1,16 @@ +using System.Collections.Generic; +using System.Linq; + +namespace OpenAuth.Domain.Interface +{ + public interface IRoleRepository :IRepository + { + IEnumerable LoadRoles(int pageindex, int pagesize); + + int GetRoleCntInOrgs(params int[] orgIds); + IEnumerable LoadInOrgs(int pageindex, int pagesize, params int[] orgIds); + + void Delete(int id); + + } +} \ No newline at end of file diff --git a/OpenAuth.Domain/OpenAuth.Domain.csproj b/OpenAuth.Domain/OpenAuth.Domain.csproj index e464cb49..511dd859 100644 --- a/OpenAuth.Domain/OpenAuth.Domain.csproj +++ b/OpenAuth.Domain/OpenAuth.Domain.csproj @@ -44,6 +44,7 @@ + diff --git a/OpenAuth.Domain/Role.cs b/OpenAuth.Domain/Role.cs index ca1f5742..7470e36f 100644 --- a/OpenAuth.Domain/Role.cs +++ b/OpenAuth.Domain/Role.cs @@ -17,7 +17,7 @@ namespace OpenAuth.Domain public int Id { get; set; } /// - /// 缁勭粐鍚嶇О + /// 鍚嶇О /// /// public string Name { get; set; } @@ -47,16 +47,22 @@ namespace OpenAuth.Domain public string CreateId { get; set; } /// - /// 鍒涘缓浜烘墍灞為儴闂ㄦ祦姘村彿 + /// 鎵灞為儴闂ㄦ祦姘村彿 /// /// - public int CreateOrgId { get; set; } + public int OrgId { get; set; } /// - /// 鍒涘缓浜烘墍灞為儴闂ㄨ妭鐐硅涔塈D + /// 鎵灞為儴闂ㄨ妭鐐硅涔塈D /// /// - public string CreateOrgCascadeId { get; set; } + public string OrgCascadeId { get; set; } + + /// + /// 鎵灞為儴闂ㄥ悕绉 + /// + /// + public string OrgName { get; set; } public Role() @@ -67,8 +73,9 @@ namespace OpenAuth.Domain this.Type= 0; this.CreateTime= DateTime.Now; this.CreateId= string.Empty; - this.CreateOrgId= 0; - this.CreateOrgCascadeId= string.Empty; + this.OrgId= 0; + this.OrgCascadeId= string.Empty; + this.OrgName= string.Empty; } diff --git a/OpenAuth.Mvc/AutofacExt.cs b/OpenAuth.Mvc/AutofacExt.cs index c059f127..e5e00b7f 100644 --- a/OpenAuth.Mvc/AutofacExt.cs +++ b/OpenAuth.Mvc/AutofacExt.cs @@ -12,12 +12,12 @@ // IOC初始化 // *********************************************************************** -using System.Reflection; -using System.Web.Mvc; using Autofac; using Autofac.Configuration; using Autofac.Integration.Mvc; using OpenAuth.App; +using System.Reflection; +using System.Web.Mvc; namespace OpenAuth.Mvc { @@ -27,12 +27,11 @@ namespace OpenAuth.Mvc { var builder = new ContainerBuilder(); - builder.RegisterModule(new ConfigurationSettingsReader("autofac")); + builder.RegisterModule(new ConfigurationSettingsReader("autofac")); builder.RegisterType(); builder.RegisterType(); builder.RegisterType(); - - + builder.RegisterType(); // Register your MVC controllers. builder.RegisterControllers(typeof(MvcApplication).Assembly); diff --git a/OpenAuth.Mvc/Controllers/RoleManagerController.cs b/OpenAuth.Mvc/Controllers/RoleManagerController.cs new file mode 100644 index 00000000..fb1fc570 --- /dev/null +++ b/OpenAuth.Mvc/Controllers/RoleManagerController.cs @@ -0,0 +1,80 @@ +using System; +using System.Web.Mvc; +using Infrastructure; +using OpenAuth.App; +using OpenAuth.App.ViewModel; +using OpenAuth.Domain; + +namespace OpenAuth.Mvc.Controllers +{ + public class RoleManagerController : BaseController + { + private RoleManagerApp _app; + + public RoleManagerController() + { + _app = (RoleManagerApp)DependencyResolver.Current.GetService(typeof(RoleManagerApp)); + } + + // + // GET: /RoleManager/ + public ActionResult Index() + { + return View(); + } + + public ActionResult Add(int id = 0) + { + return View(_app.Find(id)); + } + + //娣诲姞鎴栦慨鏀圭粍缁 + [HttpPost] + public string Add(Role view) + { + try + { + _app.AddOrUpdate(view); + + } + catch (Exception ex) + { + BjuiResponse.statusCode = "300"; + BjuiResponse.message = ex.Message; + } + return JsonHelper.Instance.Serialize(BjuiResponse); + } + + /// + /// 鍔犺浇缁勭粐涓嬮潰鐨勬墍鏈夌敤鎴 + /// + public string Load(int orgId, int pageCurrent = 1, int pageSize = 30) + { + return JsonHelper.Instance.Serialize(_app.Load(orgId, pageCurrent, pageSize)); + } + + //鑾峰彇缁勭粐涓嬮潰鐢ㄦ埛涓暟 + public int GetCount(int orgId) + { + return _app.GetRoleCntInOrg(orgId); + } + + public string Delete(string Id) + { + try + { + foreach (var obj in Id.Split(',')) + { + _app.Delete(int.Parse(obj)); + } + } + catch (Exception e) + { + BjuiResponse.statusCode = "300"; + BjuiResponse.message = e.Message; + } + + return JsonHelper.Instance.Serialize(BjuiResponse); + } + } +} \ No newline at end of file diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index 21197445..1a47fbb4 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -127,6 +127,7 @@ + Global.asax @@ -617,6 +618,8 @@ + + 10.0 diff --git a/OpenAuth.Mvc/Views/Home/Index.cshtml b/OpenAuth.Mvc/Views/Home/Index.cshtml index e812426f..54c2775b 100644 --- a/OpenAuth.Mvc/Views/Home/Index.cshtml +++ b/OpenAuth.Mvc/Views/Home/Index.cshtml @@ -206,6 +206,7 @@
  • 绯荤粺璁剧疆
  • 鏈烘瀯绠＄悊
  • 鐢ㄦ埛绠＄悊
    • +
  • 瑙掕壊绠＄悊
    • diff --git a/OpenAuth.Mvc/Views/RoleManager/Add.cshtml b/OpenAuth.Mvc/Views/RoleManager/Add.cshtml new file mode 100644 index 00000000..869dfa9e --- /dev/null +++ b/OpenAuth.Mvc/Views/RoleManager/Add.cshtml @@ -0,0 +1,132 @@ +锘緻model OpenAuth.Domain.Role +@{ + ViewBag.Title = "title"; + Layout = null; +} + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +

    * 娣诲姞

    + @Html.HiddenFor(m => m.Id) + @Html.HiddenFor(m => m.CreateTime) +
    + + + +
    + + + +
    + + + +
    + + + +
    + + + +
      +
      +
      +
      +
      +
        +
        • +
        • +
      +
      + + \ No newline at end of file diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml new file mode 100644 index 00000000..bd2c0a38 --- /dev/null +++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml @@ -0,0 +1,175 @@ +锘緻{ + string _prefix = "Role"; + var _treeId = _prefix + "Tree"; + var _gridId = _prefix + "Grid"; + var _treeDetail = _prefix + "Detail"; +} +
      +
      +
      +
        +
        + +
        +
        +
        +
        + + + diff --git a/OpenAuth.Mvc/Views/UserManager/Add.cshtml b/OpenAuth.Mvc/Views/UserManager/Add.cshtml index dfbd4b2a..69d3b017 100644 --- a/OpenAuth.Mvc/Views/UserManager/Add.cshtml +++ b/OpenAuth.Mvc/Views/UserManager/Add.cshtml @@ -1,130 +1,130 @@ -锘緻model OpenAuth.App.ViewModel.UserView -@{ - ViewBag.Title = "title"; - Layout = null; -} - -
        -
        - - - - - - - - - - - - - - - - - - - - - -

        * 娣诲姞

        - @Html.HiddenFor(m =>m.CreateTime) - @Html.HiddenFor(m =>m.Id) - - -
        - - -
        - - - -
          -
        -
        - - - -
        - - - -
        -
        -
        -
        -
          -
          • -
          • -
        -
        - - \ No newline at end of file diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml index fbe52551..1e04f365 100644 --- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml @@ -174,8 +174,8 @@ } function refreshGrid() { - //grid.refresh(); - loadDataGrid(); + $('#@_gridId').datagrid('refresh'); + // loadDataGrid(); } //@@ sourceURL=userManagerIndex.js diff --git a/OpenAuth.Mvc/Web.config b/OpenAuth.Mvc/Web.config index 5940c831..c56c9128 100644 --- a/OpenAuth.Mvc/Web.config +++ b/OpenAuth.Mvc/Web.config @@ -41,6 +41,7 @@ + diff --git a/OpenAuth.Repository/Models/Mapping/RoleMap.cs b/OpenAuth.Repository/Models/Mapping/RoleMap.cs index 1e5f387e..c4327fb0 100644 --- a/OpenAuth.Repository/Models/Mapping/RoleMap.cs +++ b/OpenAuth.Repository/Models/Mapping/RoleMap.cs @@ -20,7 +20,11 @@ namespace OpenAuth.Repository.Models.Mapping .IsRequired() .HasMaxLength(64); - this.Property(t => t.CreateOrgCascadeId) + this.Property(t => t.OrgCascadeId) + .IsRequired() + .HasMaxLength(255); + + this.Property(t => t.OrgName) .IsRequired() .HasMaxLength(255); @@ -32,8 +36,9 @@ namespace OpenAuth.Repository.Models.Mapping this.Property(t => t.Type).HasColumnName("Type"); this.Property(t => t.CreateTime).HasColumnName("CreateTime"); this.Property(t => t.CreateId).HasColumnName("CreateId"); - this.Property(t => t.CreateOrgId).HasColumnName("CreateOrgId"); - this.Property(t => t.CreateOrgCascadeId).HasColumnName("CreateOrgCascadeId"); + this.Property(t => t.OrgId).HasColumnName("OrgId"); + this.Property(t => t.OrgCascadeId).HasColumnName("OrgCascadeId"); + this.Property(t => t.OrgName).HasColumnName("OrgName"); } } } diff --git a/OpenAuth.Repository/OpenAuth.Repository.csproj b/OpenAuth.Repository/OpenAuth.Repository.csproj index 7377c616..7f3c4d67 100644 --- a/OpenAuth.Repository/OpenAuth.Repository.csproj +++ b/OpenAuth.Repository/OpenAuth.Repository.csproj @@ -69,6 +69,7 @@ +         diff --git a/OpenAuth.Repository/RoleRepository.cs b/OpenAuth.Repository/RoleRepository.cs new file mode 100644 index 00000000..21b87e93 --- /dev/null +++ b/OpenAuth.Repository/RoleRepository.cs @@ -0,0 +1,41 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using OpenAuth.Domain; +using OpenAuth.Domain.Interface; + +namespace OpenAuth.Repository +{ + public class RoleRepository :BaseRepository, IRoleRepository + { + public IEnumerable LoadRoles(int pageindex, int pagesize) + { + return Context.Roles.OrderBy(u => u.Name).Skip((pageindex - 1) * pagesize).Take(pagesize); + } + + public int GetRoleCntInOrgs(params int[] orgIds) + { + return LoadInOrgs(orgIds).Count(); + } + + public IEnumerable LoadInOrgs(int pageindex, int pagesize, params int[] orgIds) + { + return LoadInOrgs(orgIds).OrderBy(u => u.Name).Skip((pageindex - 1) * pagesize).Take(pagesize); + } + + public void Delete(int id) + { + Delete(u =>u.Id == id); + } + + public IEnumerable LoadInOrgs(params int[] orgId) + { + var result = from role in Context.Roles.Where(u => orgId.Contains(u.OrgId)) select role; + + return result; + + } + } +} diff --git a/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj b/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj index c0280a9a..346beb50 100644 --- a/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj +++ b/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj @@ -66,6 +66,7 @@ + diff --git a/OpenAuth.UnitTest/TestRoleApp.cs b/OpenAuth.UnitTest/TestRoleApp.cs new file mode 100644 index 00000000..056b2fbd --- /dev/null +++ b/OpenAuth.UnitTest/TestRoleApp.cs @@ -0,0 +1,79 @@ +锘縰sing System; +using System.Text; +using System.Collections.Generic; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using OpenAuth.App; +using OpenAuth.App.ViewModel; +using OpenAuth.Domain; +using OpenAuth.Repository; + +namespace OpenAuth.UnitTest +{ + /// + /// TestOrgApp 鐨勬憳瑕佽鏄 + /// + [TestClass] + public class TestRoleApp + { + + private RoleManagerApp _app = new RoleManagerApp(new RoleRepository(), new OrgRepository()); + private string _time = DateTime.Now.ToString("HH_mm_ss_ms"); + + + [TestMethod] + public void TestAdd() + { + for (int i = 0; i < 30; i++) + { + Add(); + } + + } + + [TestMethod] + public void TestDel() + { + var role = new Role + { + Name = "鍗冲皢鍒犻櫎" + _time, + CreateTime = DateTime.Now, + OrgId = 1 + }; + _app.AddOrUpdate(role); + Console.WriteLine("new role:" + role.Id); + _app.Delete(role.Id); + + } + + + + [TestMethod] + public void TestLoad() + { + var users = _app.Load(1,1, 10); + + } + + [TestMethod] + public void TestEdit() + { + var role = Add(); + role.Name = "淇敼鍚庣殑鍚嶇О" + _time; + _app.AddOrUpdate(role); + Console.WriteLine(role.Name); + } + + + private Role Add() + { + var role = new Role + { + Name = "test_" + _time, + CreateTime = DateTime.Now, + OrgId = 1 + }; + _app.AddOrUpdate(role); + return role; + } + } +} diff --git a/OpenAuth.UnitTest/TestUserApp.cs b/OpenAuth.UnitTest/TestUserApp.cs index eb5fe70a..4f70bc7f 100644 --- a/OpenAuth.UnitTest/TestUserApp.cs +++ b/OpenAuth.UnitTest/TestUserApp.cs @@ -1,83 +1,83 @@ -锘縰sing System; -using System.Text; -using System.Collections.Generic; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using OpenAuth.App; -using OpenAuth.App.ViewModel; -using OpenAuth.Domain; -using OpenAuth.Repository; - -namespace OpenAuth.UnitTest -{ - /// - /// TestOrgApp 鐨勬憳瑕佽鏄 - /// - [TestClass] - public class TestUserApp - { - - private UserManagerApp _app = new UserManagerApp(new UserRepository(), new OrgRepository()); - private string _time = DateTime.Now.ToString("HH_mm_ss_ms"); - - - [TestMethod] - public void TestAdd() - { - for (int i = 0; i < 30; i++) - { - Add(); - } - - - } - - [TestMethod] - public void TestDel() - { - var user = new UserView - { - Account = "user" + _time, - Name = "鍗冲皢琚垹闄ょ殑璐﹀彿" + _time, - OrganizationIds = "3,2" - - }; - _app.AddOrUpdate(user); - Console.WriteLine("new user:" + user.Id); - _app.Delete(user.Id); - - } - - - - [TestMethod] - public void TestLoad() - { - var users = _app.Load(1,1, 10); - - } - - [TestMethod] - public void TestEdit() - { - var user = Add(); - user.Name = "淇敼鍚庣殑鍚嶇О" + _time; - _app.AddOrUpdate(user); - Console.WriteLine(user.Name); - } - - - private UserView Add() - { - var user = new UserView - { - Account = "user" + _time, - Name = "鏂扮敤鎴" + _time, - OrganizationIds = "3,2" - - }; - _app.AddOrUpdate(user); - Console.WriteLine(user.Name + " \t鐢ㄦ埛ID锛" + user.Id); - return user; - } - } -} +锘縰sing System; +using System.Text; +using System.Collections.Generic; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using OpenAuth.App; +using OpenAuth.App.ViewModel; +using OpenAuth.Domain; +using OpenAuth.Repository; + +namespace OpenAuth.UnitTest +{ + /// + /// TestOrgApp 鐨勬憳瑕佽鏄 + /// + [TestClass] + public class TestUserApp + { + + private UserManagerApp _app = new UserManagerApp(new UserRepository(), new OrgRepository()); + private string _time = DateTime.Now.ToString("HH_mm_ss_ms"); + + + [TestMethod] + public void TestAdd() + { + for (int i = 0; i < 30; i++) + { + Add(); + } + + + } + + [TestMethod] + public void TestDel() + { + var user = new UserView + { + Account = "user" + _time, + Name = "鍗冲皢琚垹闄ょ殑璐﹀彿" + _time, + OrganizationIds = "3,2" + + }; + _app.AddOrUpdate(user); + Console.WriteLine("new user:" + user.Id); + _app.Delete(user.Id); + + } + + + + [TestMethod] + public void TestLoad() + { + var users = _app.Load(1,1, 10); + + } + + [TestMethod] + public void TestEdit() + { + var user = Add(); + user.Name = "淇敼鍚庣殑鍚嶇О" + _time; + _app.AddOrUpdate(user); + Console.WriteLine(user.Name); + } + + + private UserView Add() + { + var user = new UserView + { + Account = "user" + _time, + Name = "鏂扮敤鎴" + _time, + OrganizationIds = "3,2" + + }; + _app.AddOrUpdate(user); + Console.WriteLine(user.Name + " \t鐢ㄦ埛ID锛" + user.Id); + return user; + } + } +} diff --git a/鏁版嵁搴撹璁″叧绯诲浘/PDM_OA.pdb b/鏁版嵁搴撹璁″叧绯诲浘/PDM_OA.pdb index f5f13d78..f4881355 100644 --- a/鏁版嵁搴撹璁″叧绯诲浘/PDM_OA.pdb +++ b/鏁版嵁搴撹璁″叧绯诲浘/PDM_OA.pdb @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ PDM_OA 1430102287 yubaolee -1447426593 +1447817983 Administrator ORG {9C5FE510-8BFA-4205-BF00-FC94E77A24A2} DAT 1430102318 @@ -193,7 +193,7 @@ UpdateTableStatistics=Yes UpdateColumnStatistics=Yes [FolderOptions\Physical Objects\Database Generation] -GenScriptName=crebas.sql +GenScriptName=DB.sql GenScriptName0=crebas.sql GenScriptName1= GenScriptName2= @@ -204,7 +204,7 @@ GenScriptName6= GenScriptName7= GenScriptName8= GenScriptName9= -GenPathName=E:\娴嬭瘯瀛︿範\OpenAuth.Net\鏁版嵁搴撹璁″叧绯诲浘\ +GenPathName=E:\娴嬭瘯瀛︿範\OpenAuth.Net\ GenSingleFile=Yes GenODBC=Yes GenCheckModel=No @@ -3998,7 +3998,7 @@ PhysOpts= Diagram_1 1430102317 yubaolee -1447426593 +1447817983 Administrator ORG {E6596C27-1784-435C-A414-3828CD41A67C} DAT 1430102318 @@ -4686,9 +4686,9 @@ DESTINATION 0 鏂板畫浣,8,N 1445690879 -1447426481 -((23588,-64058), (43553,-45713)) -((23588,-45713),(23588,-59051),(43328,-59051),(43328,-64058)) +1447817983 +((23588,-63676), (45157,-45713)) +((23588,-45713),(23588,-59051),(44932,-59051),(44932,-63676)) 1 1 12615680 @@ -4775,9 +4775,9 @@ DESTINATION 0 鏂板畫浣,8,N 1445692935 -1447426481 -((50915,-65638), (61039,-11782)) -((60396,-11782),(60396,-31736),(51559,-31736),(51559,-65638)) +1447817983 +((51249,-65419), (61373,-11782)) +((60396,-11782),(60396,-31736),(52226,-31736),(52226,-65419)) 1 1 12615680 @@ -4861,6 +4861,28 @@ DESTINATION 0 鏂板畫浣,8,N + +1447817983 +1447817983 +((12661,-86480), (51805,-70913)) +((47680,-70913),(47680,-86068),(12661,-86068)) +1 +1 +12615680 +12632256 +CENTER 0 鏂板畫浣,8,N +SOURCE 0 鏂板畫浣,8,N +DESTINATION 0 鏂板畫浣,8,N + + + + + + + + + + 1445619891 1445621605 @@ -4882,7 +4904,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -4906,7 +4928,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -4930,7 +4952,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -4954,7 +4976,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -4978,7 +5000,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5002,14 +5024,14 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + 1445623375 -1447426481 +1447817983 -1 -((41141,-74276), (73687,-61228)) +((42994,-74951), (71834,-60553)) 3 12615680 1 @@ -5026,7 +5048,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5050,7 +5072,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5074,7 +5096,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5098,7 +5120,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5122,7 +5144,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5146,7 +5168,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5156,7 +5178,7 @@ LABL 0 鏂板畫浣,12,N - + CE74BFB2-1FDF-4618-A1EC-27BDA03FFA33 only table& key 1439219713 @@ -5515,7 +5537,7 @@ Drop=No - + 5F075477-510B-4143-825E-2CF4BD813929 dbo dbo @@ -5525,7 +5547,7 @@ Drop=No Administrator Schema - + 3492D5BC-C167-44A0-B22A-828E2367EC2C aos aos @@ -5537,7 +5559,7 @@ Drop=No - + E4134EAA-CD33-42DD-984F-37FF1454017D 鍔熻兘妯″潡琛 Module @@ -5548,7 +5570,7 @@ Drop=No 鍔熻兘妯″潡琛 - + E0B8BD77-47F6-4F4B-98A8-683B8D39D272 鍔熻兘妯″潡娴佹按鍙 Id @@ -5564,7 +5586,7 @@ Drop=No - + 0EB4AB4E-5FE7-47E1-95A4-CDAAAF56DDB4 鑺傜偣璇箟ID CascadeId @@ -5581,7 +5603,7 @@ Drop=No - + B6CA9474-5EEA-4876-A7D8-2403B88C1557 鍔熻兘妯″潡鍚嶇О Name @@ -5598,7 +5620,7 @@ Drop=No - + C5D15FFE-F9D0-4B44-BAF6-49EECDEE634C 涓婚〉闈RL Url @@ -5615,7 +5637,7 @@ Drop=No - + 5E6485E4-1416-4ADF-8E7A-4D861E7DA680 鐑敭 HotKey @@ -5632,7 +5654,7 @@ Drop=No - + A4AA838F-6A96-4C37-AC3C-06241E7F216A 鐖惰妭鐐规祦姘村彿 ParentId @@ -5648,7 +5670,7 @@ Drop=No - + 46F5B346-A767-4957-BE36-B14B40C679CB 鏄惁鍙跺瓙鑺傜偣 IsLeaf @@ -5664,7 +5686,7 @@ Drop=No - + 644ED90D-EC98-403D-AC8A-C51FC96FA7E1 鏄惁鑷姩灞曞紑 IsAutoExpand @@ -5680,7 +5702,7 @@ Drop=No - + 9B1285D2-9E87-4B20-B456-0DB798458348 鑺傜偣鍥炬爣鏂囦欢鍚嶇О IconName @@ -5697,7 +5719,7 @@ Drop=No - + 4D2A2E11-F706-4325-9E21-7BEACB9F9A79 褰撳墠鐘舵 Status @@ -5713,7 +5735,7 @@ Drop=No - + B04380BC-FAE4-4A06-8B40-F3AB2A1D9945 鐖惰妭鐐瑰悕绉 ParentName @@ -5730,7 +5752,7 @@ Drop=No - + DAA1C731-8DBD-4EEC-98DE-94C216D446DD 鐭㈤噺鍥炬爣 Vector @@ -5747,7 +5769,7 @@ Drop=No - + 574D56B4-6EA0-4478-8FEF-3EE890C408C0 鎺掑簭鍙 SortNo @@ -5762,7 +5784,7 @@ Drop=No - + 8ABEE080-5702-4464-9D28-54E42899F553 PK_aos_sys_module PK_aos_sys_module @@ -5772,26 +5794,26 @@ Drop=No Administrator PK_aos_sys_module - + - + - + 4FFFBEE5-D33A-47D2-A26E-55FA74A1BFDB 妯″潡鍏冪礌琛(闇瑕佹潈闄愭帶鍒剁殑鎸夐挳) ModuleElement 1445528606 Administrator -1447426691 +1447817855 Administrator -妯″潡鍏冪礌琛 +妯″潡鍏冪礌琛(闇瑕佹潈闄愭帶鍒剁殑鎸夐挳) - + 1F7465D7-26EB-4246-8D6A-60FDC22B4159 娴佹按鍙 Id @@ -5807,7 +5829,7 @@ Drop=No - + 46CF3C68-9833-4869-A0EE-75AF080D69A3 DOM ID DomId @@ -5824,7 +5846,7 @@ Drop=No - + 9BD51C9F-304A-43A7-AAE6-47005A19300A 鍚嶇О Name @@ -5841,7 +5863,7 @@ Drop=No - + F3F99DDA-156C-4C89-BF1E-F57E713A2C3A 绫诲瀷 Type @@ -5857,15 +5879,15 @@ Drop=No - + 46FDEFFD-7A00-433B-808B-02D75C7C06C4 鍔熻兘妯″潡Id ModuleId 1445528606 Administrator -1445622959 +1447817855 Administrator -鎵灞炲姛鑳芥ā鍧楁祦姘村彿 +鍔熻兘妯″潡Id 0 int 1 @@ -5873,7 +5895,7 @@ Drop=No - + 8C43CEB6-F418-495C-8511-D7C6FF4B5588 澶囨敞 Remark @@ -5892,7 +5914,7 @@ Drop=No - + AFF0BD94-4775-4F27-A74E-F986A6F8AAB5 Key_1 Key_1 @@ -5901,18 +5923,18 @@ Drop=No 1445622972 Administrator - + - + - + - + 4B54AD3C-7BCF-4E61-981B-FCCE3070C8E1 鍏冪礌鎺堟潈琛 ModuleElementGrant @@ -5923,7 +5945,7 @@ Drop=No 鍏冪礌鎺堟潈琛 - + 852F592F-E284-41F4-AE64-40428326B1F7 娴佹按鍙 Id @@ -5939,15 +5961,15 @@ Drop=No - + 15323C88-AB0F-415A-A34E-5A45E9FEAF9A 鍏冪礌娴佹按鍙 ElementId 1445528606 Administrator -1447426667 +1447817855 Administrator -椤甸潰鍏冪礌娴佹按鍙 +鍏冪礌娴佹按鍙 0 int 1 @@ -5955,7 +5977,7 @@ Drop=No - + A88E8EE2-9277-4E45-AA26-10EE4B06CE40 鐢ㄦ埛娴佹按鍙 UserId @@ -5971,7 +5993,7 @@ Drop=No - + A83A80F7-F508-4EB6-B829-1F826CF8725E 瑙掕壊娴佹按鍙 RoleId @@ -5987,7 +6009,7 @@ Drop=No - + 1A660153-DBA9-4BF1-88AF-F0290E055E84 鏉冮檺绫诲瀷 GrantType @@ -6005,7 +6027,7 @@ Drop=No - + 045AD971-98F9-4ACC-A7A7-9D7A2603A547 Key_1 Key_1 @@ -6014,18 +6036,18 @@ Drop=No 1445696295 Administrator - + - + - + - + 88210C9D-B90A-4B97-8D60-453D9B12D221 鍔熻兘妯″潡-瑙掕壊鍏宠仈琛 ModuleRole @@ -6036,7 +6058,7 @@ Drop=No 鍔熻兘妯″潡-瑙掕壊鍏宠仈琛 - + 32697529-5FDC-4DDB-B06B-545C20135919 娴佹按鍙 Id @@ -6052,7 +6074,7 @@ Drop=No - + 1DA086F7-1557-4755-9190-9CE7D1728E38 瑙掕壊娴佹按鍙 RoleId @@ -6068,7 +6090,7 @@ Drop=No - + 9752D161-B7AC-4350-9372-E667DAA7375B 鍔熻兘妯″潡娴佹按鍙 ModuleId @@ -6084,7 +6106,7 @@ Drop=No - + C4A152BA-7A2C-49FC-8E49-83A3C9EBF8B0 鏉冮檺绫诲瀷 Type @@ -6100,7 +6122,7 @@ Drop=No - + 57F4E5F1-5831-4B7F-A753-51C31FB9EFEA 鎺堟潈鏃堕棿 OperateTime @@ -6116,14 +6138,15 @@ Drop=No - + 1E0BAF0D-524D-42E6-89BE-45435E78D4A6 鎺堟潈浜烘祦姘村彿 OperatorId 1445528606 Administrator -1445692629 +1447817855 Administrator +鎺堟潈浜烘祦姘村彿 0 int 1 @@ -6133,7 +6156,7 @@ Drop=No - + 39D49DE5-BA09-4AA6-8ABF-568067B347FB Key_1 Key_1 @@ -6142,18 +6165,18 @@ Drop=No 1445692629 Administrator - + - + - + - + 3268BA7D-6F5A-4BC0-9FDF-2645CB73315A 鍔熻兘妯″潡-鐢ㄦ埛鍏宠仈琛 UserModule @@ -6164,7 +6187,7 @@ Drop=No 鍔熻兘妯″潡-鐢ㄦ埛鍏宠仈琛 - + DE6356EF-8750-4905-B476-1132EE3C6699 娴佹按鍙 Id @@ -6180,7 +6203,7 @@ Drop=No - + 97B4BD22-E3AA-4809-AD91-03163355E26B 鐢ㄦ埛娴佹按鍙 UserId @@ -6196,7 +6219,7 @@ Drop=No - + 1BA256AF-5036-43CC-B2CD-5F2926E82577 鍔熻兘妯″潡娴佹按鍙 ModuleId @@ -6212,7 +6235,7 @@ Drop=No - + D3FFE54D-FA3A-4F87-8747-8FAF1CE47B3C 鏉冮檺绫诲瀷 Type @@ -6228,7 +6251,7 @@ Drop=No - + 2E9F0758-71E3-4CBE-8D00-6ED87623D4F0 鎺堟潈鏃堕棿 OperateTime @@ -6244,7 +6267,7 @@ Drop=No - + F11B8596-5AD0-4A85-A7E0-9C7E932DA20C 鎺堟潈浜 OperatorId @@ -6262,7 +6285,7 @@ Drop=No - + A9CA31C8-3B19-49B9-AF20-8E9C1E303630 Key_1 Key_1 @@ -6271,45 +6294,44 @@ Drop=No 1445691077 Administrator - + - + - + - + 3664EF59-E0B7-49CA-88F3-35AF573CFF71 瑙掕壊琛 Role 1445528606 Administrator -1445703339 +1447818045 Administrator 瑙掕壊琛 - + B74AE489-B344-4AAF-A4A6-02D98742F446 娴佹按鍙 Id 1445528606 Administrator -1445690951 +1447818032 Administrator 娴佹按鍙 int -1 1 {F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,56={9C949EAB-FF87-446D-938C-8F03A4ABDC8E},National,4=true - + 6D0072E5-72CA-4EDF-9C95-7C83F44D6960 瑙掕壊鍚嶇О Name @@ -6326,7 +6348,7 @@ Drop=No - + A4E318C9-4777-4261-B011-952FD43AEE43 褰撳墠鐘舵 Status @@ -6342,7 +6364,7 @@ Drop=No - + D2A6FD1E-1672-4E98-B55B-7235370ACDD1 瑙掕壊绫诲瀷 Type @@ -6358,7 +6380,7 @@ Drop=No - + 5071422C-9978-48C4-A200-B79B4E193674 鍒涘缓鏃堕棿 CreateTime @@ -6374,7 +6396,7 @@ Drop=No - + 3CD33C75-27A6-43AE-8601-CC9A190D0A14 鍒涘缓浜篒D CreateId @@ -6391,15 +6413,15 @@ Drop=No - + 20FC6D27-5977-4818-B006-F3063FAC8D30 -鍒涘缓浜烘墍灞為儴闂ㄦ祦姘村彿 -CreateOrgId +鎵灞為儴闂ㄦ祦姘村彿 +OrgId 1445528606 Administrator -1445623500 +1447818032 Administrator -鍒涘缓浜烘墍灞為儴闂ㄦ祦姘村彿 +鎵灞為儴闂ㄦ祦姘村彿 0 int 1 @@ -6407,15 +6429,15 @@ Drop=No - + 29AA8F8B-2411-446A-98BC-280279803B26 -鍒涘缓浜烘墍灞為儴闂ㄨ妭鐐硅涔塈D -CreateOrgCascadeId +鎵灞為儴闂ㄨ妭鐐硅涔塈D +OrgCascadeId 1445528606 Administrator -1445623520 +1447817855 Administrator -鍒涘缓浜烘墍灞為儴闂ㄨ妭鐐硅涔塈D +鎵灞為儴闂ㄨ妭鐐硅涔塈D varchar(255) 255 @@ -6424,9 +6446,23 @@ Drop=No + +F31E3AC2-5BE3-4281-9F32-24B3553E5DF1 +鎵灞為儴闂ㄥ悕绉 +OrgName +1447814761 +Administrator +1447817855 +Administrator +鎵灞為儴闂ㄥ悕绉 + +varchar(255) +255 +1 + - + 83A2264E-1927-4E54-9B78-590E745A19F4 Key_1 Key_1 @@ -6435,29 +6471,29 @@ Drop=No 1445690951 Administrator - + - + - + - + 09A1B0F3-C3DE-4D0A-A0B7-7EA2F24BEFEA 缁勭粐琛 Org 1445528606 Administrator -1445703471 +1447818045 Administrator 缁勭粐琛 - + 170FC0A3-374E-4AAD-AA83-CE7EE3DC43EE 娴佹按鍙 Id @@ -6473,7 +6509,7 @@ Drop=No - + 316D0F42-F5B3-47D2-BAED-EE8586822129 鑺傜偣璇箟ID CascadeId @@ -6490,7 +6526,7 @@ Drop=No - + CE1BA668-3876-43BF-AEA6-061F4743B2E7 缁勭粐鍚嶇О Name @@ -6507,7 +6543,7 @@ Drop=No - + 3B248B87-67A6-4BAA-BC49-67596390B848 鐑敭 HotKey @@ -6524,7 +6560,7 @@ Drop=No - + EF6FC252-342A-48C6-BB3E-F6D67CE6BCC6 鐖惰妭鐐规祦姘村彿 ParentId @@ -6540,7 +6576,7 @@ Drop=No - + 811277C2-B4F2-4A69-B1E2-128E6ACF8FD7 鐖惰妭鐐瑰悕绉 ParentName @@ -6557,7 +6593,7 @@ Drop=No - + DB7B5CAB-60A1-48FA-AD4A-CBE2FC7B83F7 鏄惁鍙跺瓙鑺傜偣 IsLeaf @@ -6573,7 +6609,7 @@ Drop=No - + 5757B4AB-9CCA-4804-98B7-4C3F28294FFD 鏄惁鑷姩灞曞紑 IsAutoExpand @@ -6589,7 +6625,7 @@ Drop=No - + B8DAFBE5-21F9-44F4-9811-A88B86F37915 鑺傜偣鍥炬爣鏂囦欢鍚嶇О IconName @@ -6606,7 +6642,7 @@ Drop=No - + 58BB1D43-6FF8-4897-8985-DE3B4187A954 褰撳墠鐘舵 Status @@ -6622,7 +6658,7 @@ Drop=No - + 21DDD05F-6A26-46BB-A47A-0B90DECEF6E8 缁勭粐绫诲瀷 Type @@ -6638,7 +6674,7 @@ Drop=No - + 3B3E1509-C357-4ECA-80AE-414BF86E3655 涓氬姟瀵圭収鐮 BizCode @@ -6655,7 +6691,7 @@ Drop=No - + 37B78233-78BF-44C3-B320-04761971166C 鑷畾涔夋墿灞曠爜 CustomCode @@ -6672,7 +6708,7 @@ Drop=No - + 58436409-1E60-4D1E-B83B-D72078E625B7 鍒涘缓鏃堕棿 CreateTime @@ -6688,7 +6724,7 @@ Drop=No - + 47BD1E29-E5F7-42CD-AE9B-EECBF8A3977C 鍒涘缓浜篒D CreateId @@ -6704,7 +6740,7 @@ Drop=No - + 35865160-135D-4682-B2A8-40C6540B5F58 鎺掑簭鍙 SortNo @@ -6719,7 +6755,7 @@ Drop=No - + C3FBB434-5AAE-4EE6-9C9B-02EA25C4C6C6 Key_1 Key_1 @@ -6728,18 +6764,18 @@ Drop=No 1445623329 Administrator - + - + - + - + 67364DBD-536E-4037-9B1E-E39EB0FA6E67 鐢ㄦ埛閰嶇疆琛 UserCfg @@ -6750,7 +6786,7 @@ Drop=No 鐢ㄦ埛閰嶇疆琛 - + 0ABCBF63-6320-4DC9-8AB3-E221110F341E 鐢ㄦ埛ID Id @@ -6766,7 +6802,7 @@ Drop=No - + F3082D92-495F-44B5-BDEE-E851CDD03031 鐢ㄦ埛鐣岄潰涓婚 Theme @@ -6783,7 +6819,7 @@ Drop=No - + 3F1E27D9-E1E4-458E-A984-BB46478F26E1 鐢ㄦ埛鐣岄潰鐨偆 Skin @@ -6800,7 +6836,7 @@ Drop=No - + D3A7280E-EF38-4B13-BDA5-079A04DD4C5E 瀵艰埅鏉℃寜閽鏍 NavBarStyle @@ -6817,7 +6853,7 @@ Drop=No - + 8E725545-8F4F-4E7A-89F3-D7B58BD6A721 Tab楂樹寒棰滆壊 TabFocusColor @@ -6834,7 +6870,7 @@ Drop=No - + E54D0EF2-E29B-4C15-BA5D-5388A8FA54BD 瀵艰埅缂虹渷娲诲姩椤 NavTabIndex @@ -6852,7 +6888,7 @@ Drop=No - + 6745D1FB-7E52-46C4-8FB8-8217872F1FCC Key_1 Key_1 @@ -6861,18 +6897,18 @@ Drop=No 1445696486 Administrator - + - + - + - + DDFDF01F-2D7C-4D63-B72F-B38AE1CF219C 鐢ㄦ埛鎵╁睍淇℃伅琛 UserExt @@ -6883,7 +6919,7 @@ Drop=No 鐢ㄦ埛鎵╁睍淇℃伅琛 - + 24EF4F4C-30B9-4BFE-8AF4-4660EC197F51 鐢ㄦ埛ID Id @@ -6898,7 +6934,7 @@ Drop=No - + 3F91DA4D-8529-4D35-8866-0DD8AC58EC41 鐢靛瓙閭欢 Email @@ -6915,7 +6951,7 @@ Drop=No - + FCAC224F-A7D1-4A30-B13B-030148E932A9 鍥哄畾鐢佃瘽 Phone_ @@ -6932,7 +6968,7 @@ Drop=No - + E1CDFBD8-5D8F-44BA-942A-6F49B19193F3 绉诲姩鐢佃瘽 Mobile @@ -6949,7 +6985,7 @@ Drop=No - + 27C96944-A413-480F-9888-E3C8BD1A4C92 鑱旂郴鍦板潃 Address @@ -6966,7 +7002,7 @@ Drop=No - + 72796339-C89F-4ADA-B4C0-FC4ACB30DF5D 閭紪 Zip @@ -6983,7 +7019,7 @@ Drop=No - + 138A6AE2-B3C7-4BD4-9F09-AA8385DC4923 鐢熸棩 Birthday @@ -7000,7 +7036,7 @@ Drop=No - + 1F61BA0F-1AA9-4756-8812-3E8E6698E678 韬唤璇佸彿 IdCard @@ -7017,7 +7053,7 @@ Drop=No - + D363753B-5105-457D-AD98-12F63139B7F4 QQ QQ @@ -7034,7 +7070,7 @@ Drop=No - + EABFBB95-FF60-4811-8CB9-B4A3946EEA3B 鍔ㄦ佹墿灞曞瓧娈 DynamicField @@ -7051,7 +7087,7 @@ Drop=No - + A083A90A-9CF6-4F81-93E1-85BD1209F0FD 鐢ㄦ埛澶村儚娴佹枃浠禝D ByteArrayId @@ -7067,7 +7103,7 @@ Drop=No - + F64806FB-C204-4C84-859C-AFF5FACE42C1 澶囨敞 Remark @@ -7084,7 +7120,7 @@ Drop=No - + B970C009-D93C-4D18-A9A7-0CA142FF0DE7 闈欐佹墿灞曞瓧娈1 Field1 @@ -7101,7 +7137,7 @@ Drop=No - + 07C442F7-A4B6-4AA3-B164-C49B7948270D 闈欐佹墿灞曞瓧娈2 Field2 @@ -7118,7 +7154,7 @@ Drop=No - + 78B3AFD1-179D-45FC-BF37-90F60D520563 闈欐佹墿灞曞瓧娈3 Field3 @@ -7137,7 +7173,7 @@ Drop=No - + FCCB55F1-5C5E-48D9-9CE2-729E3A1B2D67 Key_1 Key_1 @@ -7146,18 +7182,18 @@ Drop=No 1445696478 Administrator - + - + - + - + 33B9C122-D218-47F5-9B14-C1E9CEA2BF08 鐢ㄦ埛鍩烘湰淇℃伅琛 User @@ -7168,7 +7204,7 @@ Drop=No 鐢ㄦ埛鍩烘湰淇℃伅琛 - + E2237934-7398-419A-95BF-43DFEB55913A 娴佹按鍙 Id @@ -7184,7 +7220,7 @@ Drop=No - + 94BC4150-C444-4FAB-AF89-D14B8EE680B1 鐢ㄦ埛鐧诲綍甯愬彿 Account @@ -7201,7 +7237,7 @@ Drop=No - + 2C28D983-AA57-45EC-8582-FEC60C925160 瀵嗙爜 Password @@ -7218,7 +7254,7 @@ Drop=No - + FD751868-4A7C-4604-AFFC-796866481261 鐢ㄦ埛濮撳悕 Name @@ -7235,7 +7271,7 @@ Drop=No - + C8D49687-8718-420F-A062-34E45CDA32E2 鎬у埆 Sex @@ -7251,7 +7287,7 @@ Drop=No - + 188555B8-D671-40BC-B3D5-C277B2A80592 鐢ㄦ埛鐘舵 Status @@ -7267,7 +7303,7 @@ Drop=No - + EFAF6D50-5D8C-45BE-91A2-F5052CB87250 鐢ㄦ埛绫诲瀷 Type @@ -7283,7 +7319,7 @@ Drop=No - + 39B4C8DE-280B-44D4-9E17-255EE27467F3 涓氬姟瀵圭収鐮 BizCode @@ -7300,7 +7336,7 @@ Drop=No - + 9B81F827-C810-4884-99EF-D1FE6133995D 缁忓姙鏃堕棿 CreateTime @@ -7316,7 +7352,7 @@ Drop=No - + CCCB624C-8771-4BA7-8BFB-175F91D80992 缁忓姙浜烘祦姘村彿 CreateId @@ -7334,7 +7370,7 @@ Drop=No - + 0BB30A91-88F3-4904-AB3C-3833E1F34955 Key_1 Key_1 @@ -7343,18 +7379,18 @@ Drop=No 1445622004 Administrator - + - + - + - + 36840CEB-D3CF-44A3-A523-3DAD6CAB3DBC 鐢ㄦ埛-瑙掕壊鍏宠仈琛 UserRole @@ -7365,7 +7401,7 @@ Drop=No 鐢ㄦ埛-瑙掕壊鍏宠仈琛 - + F990A94B-D1BF-4B90-B3C5-C89B983B25B4 娴佹按鍙 Id @@ -7381,19 +7417,20 @@ Drop=No - + 2704ED37-62E3-485C-A8E5-CF5BE70A9673 瑙掕壊ID RoleId 1445703271 Administrator -1445703632 +1447817855 Administrator +瑙掕壊ID 0 int 1 - + 66829880-F5D6-4D86-9C68-A983290A5FD4 鐢ㄦ埛娴佹按鍙 UserId @@ -7409,7 +7446,7 @@ Drop=No - + E7D9EA44-5F42-41A2-9F42-69C927163B65 鎺堟潈鏃堕棿 OperateTime @@ -7425,7 +7462,7 @@ Drop=No - + 19690257-CF80-449E-88BF-555CB3CBBE8A 鎺堟潈浜烘祦姘村彿 OperatorId @@ -7443,7 +7480,7 @@ Drop=No - + 21F9C8E4-B1A5-40DA-BB41-7CCBB0ED25B0 Key_1 Key_1 @@ -7452,18 +7489,18 @@ Drop=No 1445690785 Administrator - + - + - + - + 73F040A4-E02B-4E48-9337-E26F0F5161C3 鐢ㄦ埛-閮ㄩ棬鍏宠仈琛 UserOrg @@ -7474,7 +7511,7 @@ Drop=No 鐢ㄦ埛-閮ㄩ棬鍏宠仈琛 - + ED2300A1-AEFC-452B-A466-DD0D73DB87C1 娴佹按鍙 Id @@ -7490,19 +7527,20 @@ Drop=No - + 9985D3FB-C68C-4C4A-969B-420CF0FEC641 閮ㄩ棬娴佹按鍙 OrgId 1445703271 Administrator -1445703461 +1447817855 Administrator +閮ㄩ棬娴佹按鍙 0 int 1 - + DAEB00CD-80F6-4FBE-9F65-0EC3D13CC083 鐢ㄦ埛娴佹按鍙 UserId @@ -7518,7 +7556,7 @@ Drop=No - + 536F66ED-4067-4FA2-A9D3-58403E6E1144 鎺堟潈鏃堕棿 OperateTime @@ -7534,7 +7572,7 @@ Drop=No - + 7934E9D9-50B9-4B52-97AB-D2DA42C6BBC4 鎺堟潈浜烘祦姘村彿 OperatorId @@ -7552,7 +7590,7 @@ Drop=No - + 7E1829EE-6A73-4879-9F20-5479A50D6C59 Key_1 Key_1 @@ -7561,15 +7599,15 @@ Drop=No 1445703351 Administrator - + - + - + @@ -7584,26 +7622,26 @@ Drop=No Administrator 0..* - + - + - + - + 7F99DFAE-1AB5-4607-A0E2-DA5C822F5783 1445621646 Administrator 1445621716 Administrator - + - + @@ -7618,26 +7656,26 @@ Drop=No Administrator 0..* - + - + - + - + F11124ED-CB89-4144-8AAB-23989B898472 1445622572 Administrator 1445622572 Administrator - + - + @@ -7652,26 +7690,26 @@ Drop=No Administrator 0..* - + - + - + - + F9BA7987-1FF8-44E2-AFC2-49A2F989ADA4 1445622899 Administrator 1445622899 Administrator - + - + @@ -7686,26 +7724,26 @@ Drop=No Administrator 0..* - + - + - + - + CDC5D9C3-166F-43FF-B111-94DB609AD583 1445690822 Administrator 1445690850 Administrator - + - + @@ -7720,26 +7758,26 @@ Drop=No Administrator 0..* - + - + - + - + 78F68C1E-A451-47CC-B47C-60E98166BBE3 1445690940 Administrator 1445703339 Administrator - + - + @@ -7754,26 +7792,26 @@ Drop=No Administrator 0..* - + - + - + - + 995741F0-8922-4A1D-8CC8-0837BB06D71C 1445692207 Administrator 1445692257 Administrator - + - + @@ -7788,26 +7826,26 @@ Drop=No Administrator 0..* - + - + - + - + B59F1989-ABBD-479D-B7DF-4F9797C2165F 1445692211 Administrator 1445692225 Administrator - + - + @@ -7822,26 +7860,26 @@ Drop=No Administrator 0..* - + - + - + - + 53D82219-7CD6-4741-800A-2082342F25B6 1445692933 Administrator 1445693006 Administrator - + - + @@ -7856,26 +7894,26 @@ Drop=No Administrator 0..* - + - + - + - + 4EBA9634-3B65-44D5-9D21-42A4648AC0EC 1445692935 Administrator 1445693034 Administrator - + - + @@ -7890,26 +7928,26 @@ Drop=No Administrator 0..* - + - + - + - + C1EC6EDF-DC94-428A-9395-9107A04666F7 1445696414 Administrator 1445696426 Administrator - + - + @@ -7924,26 +7962,26 @@ Drop=No Administrator 0..* - + - + - + - + 040D093A-5346-415A-9264-E80ADF10D455 1445703432 Administrator 1445703451 Administrator - + - + @@ -7958,33 +7996,67 @@ Drop=No Administrator 0..* - + - + - + - + 94580DE3-E5EC-4B48-9BEA-D26BAA528928 1445703433 Administrator 1445703461 Administrator - + - + + + + + + +1F931DBA-36BD-4134-9629-6EBCD8F7A848 +FK_ROLE_REFERENCE_ORG +FK_ROLE_REFERENCE_ORG +1447817983 +Administrator +1447818045 +Administrator +0..* + + + + + + + + + + + +90A9C965-CD88-49C6-9717-293DCCF6F792 +1447817983 +Administrator +1447818032 +Administrator + + + + + - + 0188A9D5-E82A-41F9-AEDF-D25A4D738186 PUBLIC PUBLIC @@ -7993,13 +8065,13 @@ Drop=No 1445752772 Administrator - - + + - + D6AA06BA-54F2-4DEE-8CB3-F167CB23B05B Microsoft SQL Server 2008 MSSQLSRV2008 @@ -8015,7 +8087,7 @@ Drop=No - + 7F101428-6EB9-4D84-B828-37D82F8B42DB LDM_OA LDM_OA diff --git a/鏁版嵁搴撹璁″叧绯诲浘/PDM_OA.pdm b/鏁版嵁搴撹璁″叧绯诲浘/PDM_OA.pdm index bd7eaba1..bca94d65 100644 --- a/鏁版嵁搴撹璁″叧绯诲浘/PDM_OA.pdm +++ b/鏁版嵁搴撹璁″叧绯诲浘/PDM_OA.pdm @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ PDM_OA 1430102287 yubaolee -1447599897 +1447939336 Administrator ORG {9C5FE510-8BFA-4205-BF00-FC94E77A24A2} DAT 1430102318 @@ -3998,7 +3998,7 @@ PhysOpts= Diagram_1 1430102317 yubaolee -1447426593 +1447817983 Administrator ORG {E6596C27-1784-435C-A414-3828CD41A67C} DAT 1430102318 @@ -4665,7 +4665,7 @@ DESTINATION 0 鏂板畫浣,8,N 1445690822 1447426454 -((6066,-44264), (26941,-37469)) +((6066,-44264), (26828,-37469)) ((21766,-44264),(21766,-37881),(6066,-37881)) 1 1 @@ -4686,9 +4686,9 @@ DESTINATION 0 鏂板畫浣,8,N 1445690879 -1447426481 -((23588,-64058), (43553,-45713)) -((23588,-45713),(23588,-59051),(43328,-59051),(43328,-64058)) +1447817983 +((23588,-63676), (45157,-45713)) +((23588,-45713),(23588,-59051),(44932,-59051),(44932,-63676)) 1 1 12615680 @@ -4775,9 +4775,9 @@ DESTINATION 0 鏂板畫浣,8,N 1445692935 -1447426481 -((50803,-65638), (61152,-11782)) -((60396,-11782),(60396,-31736),(51559,-31736),(51559,-65638)) +1447817983 +((51249,-65419), (61373,-11782)) +((60396,-11782),(60396,-31736),(52226,-31736),(52226,-65419)) 1 1 12615680 @@ -4820,7 +4820,7 @@ DESTINATION 0 鏂板畫浣,8,N 1445703432 1447426452 -((-6934,-67310), (3040,-45110)) +((-6822,-67310), (2928,-45110)) ((-350,-67310),(-350,-58993),(-3544,-58993),(-3544,-45110)) 1 1 @@ -4842,7 +4842,7 @@ DESTINATION 0 鏂板畫浣,8,N 1445703433 1447426437 -((4280,-90068), (13879,-67632)) +((4392,-90068), (13865,-67632)) ((4518,-67632),(4518,-76744),(13640,-76744),(13640,-90068)) 1 1 @@ -4861,6 +4861,28 @@ DESTINATION 0 鏂板畫浣,8,N + +1447817983 +1447817983 +((12661,-86480), (51805,-70913)) +((47680,-70913),(47680,-86068),(12661,-86068)) +1 +1 +12615680 +12632256 +CENTER 0 鏂板畫浣,8,N +SOURCE 0 鏂板畫浣,8,N +DESTINATION 0 鏂板畫浣,8,N + + + + + + + + + + 1445619891 1445621605 @@ -4882,7 +4904,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -4906,7 +4928,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -4930,7 +4952,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -4954,7 +4976,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -4978,7 +5000,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5002,14 +5024,14 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + 1445623375 -1447426481 +1447817983 -1 -((41141,-74276), (73687,-61228)) +((42994,-74951), (71834,-60553)) 3 12615680 1 @@ -5026,7 +5048,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5050,7 +5072,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5074,7 +5096,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5098,7 +5120,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5122,7 +5144,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5146,7 +5168,7 @@ Indexes 0 鏂板畫浣,12,N Triggers 0 鏂板畫浣,12,N LABL 0 鏂板畫浣,12,N - + @@ -5156,7 +5178,7 @@ LABL 0 鏂板畫浣,12,N - + CE74BFB2-1FDF-4618-A1EC-27BDA03FFA33 only table& key 1439219713 @@ -5515,7 +5537,7 @@ Drop=No - + 5F075477-510B-4143-825E-2CF4BD813929 dbo dbo @@ -5525,7 +5547,7 @@ Drop=No Administrator Schema - + 3492D5BC-C167-44A0-B22A-828E2367EC2C aos aos @@ -5537,7 +5559,7 @@ Drop=No - + E4134EAA-CD33-42DD-984F-37FF1454017D 鍔熻兘妯″潡琛 Module @@ -5548,7 +5570,7 @@ Drop=No 鍔熻兘妯″潡琛 - + E0B8BD77-47F6-4F4B-98A8-683B8D39D272 鍔熻兘妯″潡娴佹按鍙 Id @@ -5564,7 +5586,7 @@ Drop=No - + 0EB4AB4E-5FE7-47E1-95A4-CDAAAF56DDB4 鑺傜偣璇箟ID CascadeId @@ -5581,7 +5603,7 @@ Drop=No - + B6CA9474-5EEA-4876-A7D8-2403B88C1557 鍔熻兘妯″潡鍚嶇О Name @@ -5598,7 +5620,7 @@ Drop=No - + C5D15FFE-F9D0-4B44-BAF6-49EECDEE634C 涓婚〉闈RL Url @@ -5615,7 +5637,7 @@ Drop=No - + 5E6485E4-1416-4ADF-8E7A-4D861E7DA680 鐑敭 HotKey @@ -5632,7 +5654,7 @@ Drop=No - + A4AA838F-6A96-4C37-AC3C-06241E7F216A 鐖惰妭鐐规祦姘村彿 ParentId @@ -5648,7 +5670,7 @@ Drop=No - + 46F5B346-A767-4957-BE36-B14B40C679CB 鏄惁鍙跺瓙鑺傜偣 IsLeaf @@ -5664,7 +5686,7 @@ Drop=No - + 644ED90D-EC98-403D-AC8A-C51FC96FA7E1 鏄惁鑷姩灞曞紑 IsAutoExpand @@ -5680,7 +5702,7 @@ Drop=No - + 9B1285D2-9E87-4B20-B456-0DB798458348 鑺傜偣鍥炬爣鏂囦欢鍚嶇О IconName @@ -5697,7 +5719,7 @@ Drop=No - + 4D2A2E11-F706-4325-9E21-7BEACB9F9A79 褰撳墠鐘舵 Status @@ -5713,7 +5735,7 @@ Drop=No - + B04380BC-FAE4-4A06-8B40-F3AB2A1D9945 鐖惰妭鐐瑰悕绉 ParentName @@ -5730,7 +5752,7 @@ Drop=No - + DAA1C731-8DBD-4EEC-98DE-94C216D446DD 鐭㈤噺鍥炬爣 Vector @@ -5747,7 +5769,7 @@ Drop=No - + 574D56B4-6EA0-4478-8FEF-3EE890C408C0 鎺掑簭鍙 SortNo @@ -5762,7 +5784,7 @@ Drop=No - + 8ABEE080-5702-4464-9D28-54E42899F553 PK_aos_sys_module PK_aos_sys_module @@ -5772,26 +5794,26 @@ Drop=No Administrator PK_aos_sys_module - + - + - + 4FFFBEE5-D33A-47D2-A26E-55FA74A1BFDB 妯″潡鍏冪礌琛(闇瑕佹潈闄愭帶鍒剁殑鎸夐挳) ModuleElement 1445528606 Administrator -1447426691 +1447817855 Administrator -妯″潡鍏冪礌琛 +妯″潡鍏冪礌琛(闇瑕佹潈闄愭帶鍒剁殑鎸夐挳) - + 1F7465D7-26EB-4246-8D6A-60FDC22B4159 娴佹按鍙 Id @@ -5807,7 +5829,7 @@ Drop=No - + 46CF3C68-9833-4869-A0EE-75AF080D69A3 DOM ID DomId @@ -5824,7 +5846,7 @@ Drop=No - + 9BD51C9F-304A-43A7-AAE6-47005A19300A 鍚嶇О Name @@ -5841,7 +5863,7 @@ Drop=No - + F3F99DDA-156C-4C89-BF1E-F57E713A2C3A 绫诲瀷 Type @@ -5857,15 +5879,15 @@ Drop=No - + 46FDEFFD-7A00-433B-808B-02D75C7C06C4 鍔熻兘妯″潡Id ModuleId 1445528606 Administrator -1445622959 +1447817855 Administrator -鎵灞炲姛鑳芥ā鍧楁祦姘村彿 +鍔熻兘妯″潡Id 0 int 1 @@ -5873,7 +5895,7 @@ Drop=No - + 8C43CEB6-F418-495C-8511-D7C6FF4B5588 澶囨敞 Remark @@ -5892,7 +5914,7 @@ Drop=No - + AFF0BD94-4775-4F27-A74E-F986A6F8AAB5 Key_1 Key_1 @@ -5901,18 +5923,18 @@ Drop=No 1445622972 Administrator - + - + - + - + 4B54AD3C-7BCF-4E61-981B-FCCE3070C8E1 鍏冪礌鎺堟潈琛 ModuleElementGrant @@ -5923,7 +5945,7 @@ Drop=No 鍏冪礌鎺堟潈琛 - + 852F592F-E284-41F4-AE64-40428326B1F7 娴佹按鍙 Id @@ -5939,15 +5961,15 @@ Drop=No - + 15323C88-AB0F-415A-A34E-5A45E9FEAF9A 鍏冪礌娴佹按鍙 ElementId 1445528606 Administrator -1447426667 +1447817855 Administrator -椤甸潰鍏冪礌娴佹按鍙 +鍏冪礌娴佹按鍙 0 int 1 @@ -5955,7 +5977,7 @@ Drop=No - + A88E8EE2-9277-4E45-AA26-10EE4B06CE40 鐢ㄦ埛娴佹按鍙 UserId @@ -5971,7 +5993,7 @@ Drop=No - + A83A80F7-F508-4EB6-B829-1F826CF8725E 瑙掕壊娴佹按鍙 RoleId @@ -5987,7 +6009,7 @@ Drop=No - + 1A660153-DBA9-4BF1-88AF-F0290E055E84 鏉冮檺绫诲瀷 GrantType @@ -6005,7 +6027,7 @@ Drop=No - + 045AD971-98F9-4ACC-A7A7-9D7A2603A547 Key_1 Key_1 @@ -6014,18 +6036,18 @@ Drop=No 1445696295 Administrator - + - + - + - + 88210C9D-B90A-4B97-8D60-453D9B12D221 鍔熻兘妯″潡-瑙掕壊鍏宠仈琛 ModuleRole @@ -6036,7 +6058,7 @@ Drop=No 鍔熻兘妯″潡-瑙掕壊鍏宠仈琛 - + 32697529-5FDC-4DDB-B06B-545C20135919 娴佹按鍙 Id @@ -6052,7 +6074,7 @@ Drop=No - + 1DA086F7-1557-4755-9190-9CE7D1728E38 瑙掕壊娴佹按鍙 RoleId @@ -6068,7 +6090,7 @@ Drop=No - + 9752D161-B7AC-4350-9372-E667DAA7375B 鍔熻兘妯″潡娴佹按鍙 ModuleId @@ -6084,7 +6106,7 @@ Drop=No - + C4A152BA-7A2C-49FC-8E49-83A3C9EBF8B0 鏉冮檺绫诲瀷 Type @@ -6100,7 +6122,7 @@ Drop=No - + 57F4E5F1-5831-4B7F-A753-51C31FB9EFEA 鎺堟潈鏃堕棿 OperateTime @@ -6116,14 +6138,15 @@ Drop=No - + 1E0BAF0D-524D-42E6-89BE-45435E78D4A6 鎺堟潈浜烘祦姘村彿 OperatorId 1445528606 Administrator -1445692629 +1447817855 Administrator +鎺堟潈浜烘祦姘村彿 0 int 1 @@ -6133,7 +6156,7 @@ Drop=No - + 39D49DE5-BA09-4AA6-8ABF-568067B347FB Key_1 Key_1 @@ -6142,18 +6165,18 @@ Drop=No 1445692629 Administrator - + - + - + - + 3268BA7D-6F5A-4BC0-9FDF-2645CB73315A 鍔熻兘妯″潡-鐢ㄦ埛鍏宠仈琛 UserModule @@ -6164,7 +6187,7 @@ Drop=No 鍔熻兘妯″潡-鐢ㄦ埛鍏宠仈琛 - + DE6356EF-8750-4905-B476-1132EE3C6699 娴佹按鍙 Id @@ -6180,7 +6203,7 @@ Drop=No - + 97B4BD22-E3AA-4809-AD91-03163355E26B 鐢ㄦ埛娴佹按鍙 UserId @@ -6196,7 +6219,7 @@ Drop=No - + 1BA256AF-5036-43CC-B2CD-5F2926E82577 鍔熻兘妯″潡娴佹按鍙 ModuleId @@ -6212,7 +6235,7 @@ Drop=No - + D3FFE54D-FA3A-4F87-8747-8FAF1CE47B3C 鏉冮檺绫诲瀷 Type @@ -6228,7 +6251,7 @@ Drop=No - + 2E9F0758-71E3-4CBE-8D00-6ED87623D4F0 鎺堟潈鏃堕棿 OperateTime @@ -6244,7 +6267,7 @@ Drop=No - + F11B8596-5AD0-4A85-A7E0-9C7E932DA20C 鎺堟潈浜 OperatorId @@ -6262,7 +6285,7 @@ Drop=No - + A9CA31C8-3B19-49B9-AF20-8E9C1E303630 Key_1 Key_1 @@ -6271,45 +6294,44 @@ Drop=No 1445691077 Administrator - + - + - + - + 3664EF59-E0B7-49CA-88F3-35AF573CFF71 瑙掕壊琛 Role 1445528606 Administrator -1445703339 +1447818045 Administrator 瑙掕壊琛 - + B74AE489-B344-4AAF-A4A6-02D98742F446 娴佹按鍙 Id 1445528606 Administrator -1445690951 +1447818032 Administrator 娴佹按鍙 int -1 1 {F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,56={9C949EAB-FF87-446D-938C-8F03A4ABDC8E},National,4=true - + 6D0072E5-72CA-4EDF-9C95-7C83F44D6960 瑙掕壊鍚嶇О Name @@ -6326,7 +6348,7 @@ Drop=No - + A4E318C9-4777-4261-B011-952FD43AEE43 褰撳墠鐘舵 Status @@ -6342,7 +6364,7 @@ Drop=No - + D2A6FD1E-1672-4E98-B55B-7235370ACDD1 瑙掕壊绫诲瀷 Type @@ -6358,7 +6380,7 @@ Drop=No - + 5071422C-9978-48C4-A200-B79B4E193674 鍒涘缓鏃堕棿 CreateTime @@ -6374,7 +6396,7 @@ Drop=No - + 3CD33C75-27A6-43AE-8601-CC9A190D0A14 鍒涘缓浜篒D CreateId @@ -6391,15 +6413,15 @@ Drop=No - + 20FC6D27-5977-4818-B006-F3063FAC8D30 -鍒涘缓浜烘墍灞為儴闂ㄦ祦姘村彿 -CreateOrgId +鎵灞為儴闂ㄦ祦姘村彿 +OrgId 1445528606 Administrator -1445623500 +1447818032 Administrator -鍒涘缓浜烘墍灞為儴闂ㄦ祦姘村彿 +鎵灞為儴闂ㄦ祦姘村彿 0 int 1 @@ -6407,15 +6429,15 @@ Drop=No - + 29AA8F8B-2411-446A-98BC-280279803B26 -鍒涘缓浜烘墍灞為儴闂ㄨ妭鐐硅涔塈D -CreateOrgCascadeId +鎵灞為儴闂ㄨ妭鐐硅涔塈D +OrgCascadeId 1445528606 Administrator -1445623520 +1447817855 Administrator -鍒涘缓浜烘墍灞為儴闂ㄨ妭鐐硅涔塈D +鎵灞為儴闂ㄨ妭鐐硅涔塈D varchar(255) 255 @@ -6424,9 +6446,23 @@ Drop=No + +F31E3AC2-5BE3-4281-9F32-24B3553E5DF1 +鎵灞為儴闂ㄥ悕绉 +OrgName +1447814761 +Administrator +1447817855 +Administrator +鎵灞為儴闂ㄥ悕绉 + +varchar(255) +255 +1 + - + 83A2264E-1927-4E54-9B78-590E745A19F4 Key_1 Key_1 @@ -6435,29 +6471,29 @@ Drop=No 1445690951 Administrator - + - + - + - + 09A1B0F3-C3DE-4D0A-A0B7-7EA2F24BEFEA 缁勭粐琛 Org 1445528606 Administrator -1445703471 +1447818045 Administrator 缁勭粐琛 - + 170FC0A3-374E-4AAD-AA83-CE7EE3DC43EE 娴佹按鍙 Id @@ -6473,7 +6509,7 @@ Drop=No - + 316D0F42-F5B3-47D2-BAED-EE8586822129 鑺傜偣璇箟ID CascadeId @@ -6490,7 +6526,7 @@ Drop=No - + CE1BA668-3876-43BF-AEA6-061F4743B2E7 缁勭粐鍚嶇О Name @@ -6507,7 +6543,7 @@ Drop=No - + 3B248B87-67A6-4BAA-BC49-67596390B848 鐑敭 HotKey @@ -6524,7 +6560,7 @@ Drop=No - + EF6FC252-342A-48C6-BB3E-F6D67CE6BCC6 鐖惰妭鐐规祦姘村彿 ParentId @@ -6540,7 +6576,7 @@ Drop=No - + 811277C2-B4F2-4A69-B1E2-128E6ACF8FD7 鐖惰妭鐐瑰悕绉 ParentName @@ -6557,7 +6593,7 @@ Drop=No - + DB7B5CAB-60A1-48FA-AD4A-CBE2FC7B83F7 鏄惁鍙跺瓙鑺傜偣 IsLeaf @@ -6573,7 +6609,7 @@ Drop=No - + 5757B4AB-9CCA-4804-98B7-4C3F28294FFD 鏄惁鑷姩灞曞紑 IsAutoExpand @@ -6589,7 +6625,7 @@ Drop=No - + B8DAFBE5-21F9-44F4-9811-A88B86F37915 鑺傜偣鍥炬爣鏂囦欢鍚嶇О IconName @@ -6606,7 +6642,7 @@ Drop=No - + 58BB1D43-6FF8-4897-8985-DE3B4187A954 褰撳墠鐘舵 Status @@ -6622,7 +6658,7 @@ Drop=No - + 21DDD05F-6A26-46BB-A47A-0B90DECEF6E8 缁勭粐绫诲瀷 Type @@ -6638,7 +6674,7 @@ Drop=No - + 3B3E1509-C357-4ECA-80AE-414BF86E3655 涓氬姟瀵圭収鐮 BizCode @@ -6655,7 +6691,7 @@ Drop=No - + 37B78233-78BF-44C3-B320-04761971166C 鑷畾涔夋墿灞曠爜 CustomCode @@ -6672,7 +6708,7 @@ Drop=No - + 58436409-1E60-4D1E-B83B-D72078E625B7 鍒涘缓鏃堕棿 CreateTime @@ -6688,7 +6724,7 @@ Drop=No - + 47BD1E29-E5F7-42CD-AE9B-EECBF8A3977C 鍒涘缓浜篒D CreateId @@ -6704,7 +6740,7 @@ Drop=No - + 35865160-135D-4682-B2A8-40C6540B5F58 鎺掑簭鍙 SortNo @@ -6719,7 +6755,7 @@ Drop=No - + C3FBB434-5AAE-4EE6-9C9B-02EA25C4C6C6 Key_1 Key_1 @@ -6728,18 +6764,18 @@ Drop=No 1445623329 Administrator - + - + - + - + 67364DBD-536E-4037-9B1E-E39EB0FA6E67 鐢ㄦ埛閰嶇疆琛 UserCfg @@ -6750,7 +6786,7 @@ Drop=No 鐢ㄦ埛閰嶇疆琛 - + 0ABCBF63-6320-4DC9-8AB3-E221110F341E 鐢ㄦ埛ID Id @@ -6766,7 +6802,7 @@ Drop=No - + F3082D92-495F-44B5-BDEE-E851CDD03031 鐢ㄦ埛鐣岄潰涓婚 Theme @@ -6783,7 +6819,7 @@ Drop=No - + 3F1E27D9-E1E4-458E-A984-BB46478F26E1 鐢ㄦ埛鐣岄潰鐨偆 Skin @@ -6800,7 +6836,7 @@ Drop=No - + D3A7280E-EF38-4B13-BDA5-079A04DD4C5E 瀵艰埅鏉℃寜閽鏍 NavBarStyle @@ -6817,7 +6853,7 @@ Drop=No - + 8E725545-8F4F-4E7A-89F3-D7B58BD6A721 Tab楂樹寒棰滆壊 TabFocusColor @@ -6834,7 +6870,7 @@ Drop=No - + E54D0EF2-E29B-4C15-BA5D-5388A8FA54BD 瀵艰埅缂虹渷娲诲姩椤 NavTabIndex @@ -6852,7 +6888,7 @@ Drop=No - + 6745D1FB-7E52-46C4-8FB8-8217872F1FCC Key_1 Key_1 @@ -6861,18 +6897,18 @@ Drop=No 1445696486 Administrator - + - + - + - + DDFDF01F-2D7C-4D63-B72F-B38AE1CF219C 鐢ㄦ埛鎵╁睍淇℃伅琛 UserExt @@ -6883,7 +6919,7 @@ Drop=No 鐢ㄦ埛鎵╁睍淇℃伅琛 - + 24EF4F4C-30B9-4BFE-8AF4-4660EC197F51 鐢ㄦ埛ID Id @@ -6898,7 +6934,7 @@ Drop=No - + 3F91DA4D-8529-4D35-8866-0DD8AC58EC41 鐢靛瓙閭欢 Email @@ -6915,7 +6951,7 @@ Drop=No - + FCAC224F-A7D1-4A30-B13B-030148E932A9 鍥哄畾鐢佃瘽 Phone_ @@ -6932,7 +6968,7 @@ Drop=No - + E1CDFBD8-5D8F-44BA-942A-6F49B19193F3 绉诲姩鐢佃瘽 Mobile @@ -6949,7 +6985,7 @@ Drop=No - + 27C96944-A413-480F-9888-E3C8BD1A4C92 鑱旂郴鍦板潃 Address @@ -6966,7 +7002,7 @@ Drop=No - + 72796339-C89F-4ADA-B4C0-FC4ACB30DF5D 閭紪 Zip @@ -6983,7 +7019,7 @@ Drop=No - + 138A6AE2-B3C7-4BD4-9F09-AA8385DC4923 鐢熸棩 Birthday @@ -7000,7 +7036,7 @@ Drop=No - + 1F61BA0F-1AA9-4756-8812-3E8E6698E678 韬唤璇佸彿 IdCard @@ -7017,7 +7053,7 @@ Drop=No - + D363753B-5105-457D-AD98-12F63139B7F4 QQ QQ @@ -7034,7 +7070,7 @@ Drop=No - + EABFBB95-FF60-4811-8CB9-B4A3946EEA3B 鍔ㄦ佹墿灞曞瓧娈 DynamicField @@ -7051,7 +7087,7 @@ Drop=No - + A083A90A-9CF6-4F81-93E1-85BD1209F0FD 鐢ㄦ埛澶村儚娴佹枃浠禝D ByteArrayId @@ -7067,7 +7103,7 @@ Drop=No - + F64806FB-C204-4C84-859C-AFF5FACE42C1 澶囨敞 Remark @@ -7084,7 +7120,7 @@ Drop=No - + B970C009-D93C-4D18-A9A7-0CA142FF0DE7 闈欐佹墿灞曞瓧娈1 Field1 @@ -7101,7 +7137,7 @@ Drop=No - + 07C442F7-A4B6-4AA3-B164-C49B7948270D 闈欐佹墿灞曞瓧娈2 Field2 @@ -7118,7 +7154,7 @@ Drop=No - + 78B3AFD1-179D-45FC-BF37-90F60D520563 闈欐佹墿灞曞瓧娈3 Field3 @@ -7137,7 +7173,7 @@ Drop=No - + FCCB55F1-5C5E-48D9-9CE2-729E3A1B2D67 Key_1 Key_1 @@ -7146,18 +7182,18 @@ Drop=No 1445696478 Administrator - + - + - + - + 33B9C122-D218-47F5-9B14-C1E9CEA2BF08 鐢ㄦ埛鍩烘湰淇℃伅琛 User @@ -7168,7 +7204,7 @@ Drop=No 鐢ㄦ埛鍩烘湰淇℃伅琛 - + E2237934-7398-419A-95BF-43DFEB55913A 娴佹按鍙 Id @@ -7184,7 +7220,7 @@ Drop=No - + 94BC4150-C444-4FAB-AF89-D14B8EE680B1 鐢ㄦ埛鐧诲綍甯愬彿 Account @@ -7201,7 +7237,7 @@ Drop=No - + 2C28D983-AA57-45EC-8582-FEC60C925160 瀵嗙爜 Password @@ -7218,7 +7254,7 @@ Drop=No - + FD751868-4A7C-4604-AFFC-796866481261 鐢ㄦ埛濮撳悕 Name @@ -7235,7 +7271,7 @@ Drop=No - + C8D49687-8718-420F-A062-34E45CDA32E2 鎬у埆 Sex @@ -7251,7 +7287,7 @@ Drop=No - + 188555B8-D671-40BC-B3D5-C277B2A80592 鐢ㄦ埛鐘舵 Status @@ -7267,7 +7303,7 @@ Drop=No - + EFAF6D50-5D8C-45BE-91A2-F5052CB87250 鐢ㄦ埛绫诲瀷 Type @@ -7283,7 +7319,7 @@ Drop=No - + 39B4C8DE-280B-44D4-9E17-255EE27467F3 涓氬姟瀵圭収鐮 BizCode @@ -7300,7 +7336,7 @@ Drop=No - + 9B81F827-C810-4884-99EF-D1FE6133995D 缁忓姙鏃堕棿 CreateTime @@ -7316,7 +7352,7 @@ Drop=No - + CCCB624C-8771-4BA7-8BFB-175F91D80992 缁忓姙浜烘祦姘村彿 CreateId @@ -7334,7 +7370,7 @@ Drop=No - + 0BB30A91-88F3-4904-AB3C-3833E1F34955 Key_1 Key_1 @@ -7343,18 +7379,18 @@ Drop=No 1445622004 Administrator - + - + - + - + 36840CEB-D3CF-44A3-A523-3DAD6CAB3DBC 鐢ㄦ埛-瑙掕壊鍏宠仈琛 UserRole @@ -7365,7 +7401,7 @@ Drop=No 鐢ㄦ埛-瑙掕壊鍏宠仈琛 - + F990A94B-D1BF-4B90-B3C5-C89B983B25B4 娴佹按鍙 Id @@ -7381,19 +7417,20 @@ Drop=No - + 2704ED37-62E3-485C-A8E5-CF5BE70A9673 瑙掕壊ID RoleId 1445703271 Administrator -1445703632 +1447817855 Administrator +瑙掕壊ID 0 int 1 - + 66829880-F5D6-4D86-9C68-A983290A5FD4 鐢ㄦ埛娴佹按鍙 UserId @@ -7409,7 +7446,7 @@ Drop=No - + E7D9EA44-5F42-41A2-9F42-69C927163B65 鎺堟潈鏃堕棿 OperateTime @@ -7425,7 +7462,7 @@ Drop=No - + 19690257-CF80-449E-88BF-555CB3CBBE8A 鎺堟潈浜烘祦姘村彿 OperatorId @@ -7443,7 +7480,7 @@ Drop=No - + 21F9C8E4-B1A5-40DA-BB41-7CCBB0ED25B0 Key_1 Key_1 @@ -7452,18 +7489,18 @@ Drop=No 1445690785 Administrator - + - + - + - + 73F040A4-E02B-4E48-9337-E26F0F5161C3 鐢ㄦ埛-閮ㄩ棬鍏宠仈琛 UserOrg @@ -7474,7 +7511,7 @@ Drop=No 鐢ㄦ埛-閮ㄩ棬鍏宠仈琛 - + ED2300A1-AEFC-452B-A466-DD0D73DB87C1 娴佹按鍙 Id @@ -7490,19 +7527,20 @@ Drop=No - + 9985D3FB-C68C-4C4A-969B-420CF0FEC641 閮ㄩ棬娴佹按鍙 OrgId 1445703271 Administrator -1445703461 +1447817855 Administrator +閮ㄩ棬娴佹按鍙 0 int 1 - + DAEB00CD-80F6-4FBE-9F65-0EC3D13CC083 鐢ㄦ埛娴佹按鍙 UserId @@ -7518,7 +7556,7 @@ Drop=No - + 536F66ED-4067-4FA2-A9D3-58403E6E1144 鎺堟潈鏃堕棿 OperateTime @@ -7534,7 +7572,7 @@ Drop=No - + 7934E9D9-50B9-4B52-97AB-D2DA42C6BBC4 鎺堟潈浜烘祦姘村彿 OperatorId @@ -7552,7 +7590,7 @@ Drop=No - + 7E1829EE-6A73-4879-9F20-5479A50D6C59 Key_1 Key_1 @@ -7561,15 +7599,15 @@ Drop=No 1445703351 Administrator - + - + - + @@ -7584,26 +7622,26 @@ Drop=No Administrator 0..* - + - + - + - + 7F99DFAE-1AB5-4607-A0E2-DA5C822F5783 1445621646 Administrator 1445621716 Administrator - + - + @@ -7618,26 +7656,26 @@ Drop=No Administrator 0..* - + - + - + - + F11124ED-CB89-4144-8AAB-23989B898472 1445622572 Administrator 1445622572 Administrator - + - + @@ -7652,26 +7690,26 @@ Drop=No Administrator 0..* - + - + - + - + F9BA7987-1FF8-44E2-AFC2-49A2F989ADA4 1445622899 Administrator 1445622899 Administrator - + - + @@ -7686,26 +7724,26 @@ Drop=No Administrator 0..* - + - + - + - + CDC5D9C3-166F-43FF-B111-94DB609AD583 1445690822 Administrator 1445690850 Administrator - + - + @@ -7720,26 +7758,26 @@ Drop=No Administrator 0..* - + - + - + - + 78F68C1E-A451-47CC-B47C-60E98166BBE3 1445690940 Administrator 1445703339 Administrator - + - + @@ -7754,26 +7792,26 @@ Drop=No Administrator 0..* - + - + - + - + 995741F0-8922-4A1D-8CC8-0837BB06D71C 1445692207 Administrator 1445692257 Administrator - + - + @@ -7788,26 +7826,26 @@ Drop=No Administrator 0..* - + - + - + - + B59F1989-ABBD-479D-B7DF-4F9797C2165F 1445692211 Administrator 1445692225 Administrator - + - + @@ -7822,26 +7860,26 @@ Drop=No Administrator 0..* - + - + - + - + 53D82219-7CD6-4741-800A-2082342F25B6 1445692933 Administrator 1445693006 Administrator - + - + @@ -7856,26 +7894,26 @@ Drop=No Administrator 0..* - + - + - + - + 4EBA9634-3B65-44D5-9D21-42A4648AC0EC 1445692935 Administrator 1445693034 Administrator - + - + @@ -7890,26 +7928,26 @@ Drop=No Administrator 0..* - + - + - + - + C1EC6EDF-DC94-428A-9395-9107A04666F7 1445696414 Administrator 1445696426 Administrator - + - + @@ -7924,26 +7962,26 @@ Drop=No Administrator 0..* - + - + - + - + 040D093A-5346-415A-9264-E80ADF10D455 1445703432 Administrator 1445703451 Administrator - + - + @@ -7958,33 +7996,67 @@ Drop=No Administrator 0..* - + - + - + - + 94580DE3-E5EC-4B48-9BEA-D26BAA528928 1445703433 Administrator 1445703461 Administrator - + - + + + + + + +1F931DBA-36BD-4134-9629-6EBCD8F7A848 +FK_ROLE_REFERENCE_ORG +FK_ROLE_REFERENCE_ORG +1447817983 +Administrator +1447818045 +Administrator +0..* + + + + + + + + + + + +90A9C965-CD88-49C6-9717-293DCCF6F792 +1447817983 +Administrator +1447818032 +Administrator + + + + + - + 0188A9D5-E82A-41F9-AEDF-D25A4D738186 PUBLIC PUBLIC @@ -7993,13 +8065,13 @@ Drop=No 1445752772 Administrator - - + + - + D6AA06BA-54F2-4DEE-8CB3-F167CB23B05B Microsoft SQL Server 2008 MSSQLSRV2008 @@ -8015,7 +8087,7 @@ Drop=No - + 7F101428-6EB9-4D84-B828-37D82F8B42DB LDM_OA LDM_OA