diff --git a/.collaboration b/.collaboration index c343d4ba..bc63c6b5 100644 --- a/.collaboration +++ b/.collaboration @@ -5,137 +5,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4014776+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015157+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015174+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015198+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015228+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015237+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015249+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015258+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015271+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -392,47 +302,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015898+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015931+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.4015955+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -613,17 +493,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:20:28.401603+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -2800,19 +2670,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-01-23T15:21:24.5837388+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\Load.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index b5aa54ae..8062599d 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/Tables/用户/用户组织关系视图.json b/Tables/用户/用户组织关系视图.json index 66471c6a..79143a6a 100644 --- a/Tables/用户/用户组织关系视图.json +++ b/Tables/用户/用户组织关系视图.json @@ -40,7 +40,7 @@ "BuiltInViewInfo": { "ViewName": "用户组织关系视图", "SourceTableName": "FGC_UMV_OUR", - "CreateViewSql": "SELECT [组织Id] AS [组织Id], [用户名] AS [用户名], [是否主管] AS [是否主管], [组织角色Id集合] AS [组织角色Id集合], [组织角色名称集合] AS [组织角色名称集合] FROM [FGC_UMV_OUR]", + "CreateViewSql": "SELECT s.[组织Id] AS [组织Id], s.[用户名] AS [用户名], s.[是否主管] AS [是否主管], s.[组织角色Id集合] AS [组织角色Id集合], s.[组织角色名称集合] AS [组织角色名称集合] FROM [FGC_UMV_OUR] s", "ViewType": 10 }, "PrimaryKey": [ diff --git a/Tables/用户/用户角色关系视图.json b/Tables/用户/用户角色关系视图.json index 86d6e57e..6d1d84e8 100644 --- a/Tables/用户/用户角色关系视图.json +++ b/Tables/用户/用户角色关系视图.json @@ -26,7 +26,7 @@ "BuiltInViewInfo": { "ViewName": "用户角色关系视图", "SourceTableName": "FGC_UMV_RUR", - "CreateViewSql": "SELECT [角色Id] AS [角色Id], [用户名] AS [用户名], [来自组织] AS [来自组织] FROM [FGC_UMV_RUR]", + "CreateViewSql": "SELECT s.[角色Id] AS [角色Id], s.[用户名] AS [用户名], s.[来自组织] AS [来自组织] FROM [FGC_UMV_RUR] s", "ViewType": 6 }, "PrimaryKey": [ diff --git a/Tables/用户/组织信息视图.json b/Tables/用户/组织信息视图.json index 4a60c5bb..97ddc06c 100644 --- a/Tables/用户/组织信息视图.json +++ b/Tables/用户/组织信息视图.json @@ -47,7 +47,7 @@ "BuiltInViewInfo": { "ViewName": "组织信息视图", "SourceTableName": "FGC_UMV_OI", - "CreateViewSql": "SELECT [组织Id] AS [组织Id], [组织名] AS [组织名], [父节点Id] AS [父节点Id], [组织级别Id] AS [组织级别Id], [排序] AS [排序], [组织路径] AS [组织路径] FROM [FGC_UMV_OI]", + "CreateViewSql": "SELECT s.[组织Id] AS [组织Id], s.[组织名] AS [组织名], s.[父节点Id] AS [父节点Id], s.[组织级别Id] AS [组织级别Id], s.[排序] AS [排序], s.[组织路径] AS [组织路径] FROM [FGC_UMV_OI] s", "ViewType": 5 }, "PrimaryKey": [ diff --git a/Tables/用户/组织级别视图.json b/Tables/用户/组织级别视图.json index 71fdb509..2f96d4e5 100644 --- a/Tables/用户/组织级别视图.json +++ b/Tables/用户/组织级别视图.json @@ -19,7 +19,7 @@ "BuiltInViewInfo": { "ViewName": "组织级别视图", "SourceTableName": "FGC_UMV_OLI", - "CreateViewSql": "SELECT [组织级别Id] AS [组织级别Id], [组织级别名称] AS [组织级别名称] FROM [FGC_UMV_OLI]", + "CreateViewSql": "SELECT s.[组织级别Id] AS [组织级别Id], s.[组织级别名称] AS [组织级别名称] FROM [FGC_UMV_OLI] s", "ViewType": 11 }, "PrimaryKey": [ diff --git a/Tables/用户/角色信息视图.json b/Tables/用户/角色信息视图.json index 2485cbe8..e1fed5a0 100644 --- a/Tables/用户/角色信息视图.json +++ b/Tables/用户/角色信息视图.json @@ -33,7 +33,7 @@ "BuiltInViewInfo": { "ViewName": "角色信息视图", "SourceTableName": "FGC_UMV_RI", - "CreateViewSql": "SELECT [角色Id] AS [角色Id], [角色名] AS [角色名], [描述] AS [描述], [上级分类Id] AS [上级分类Id] FROM [FGC_UMV_RI]", + "CreateViewSql": "SELECT s.[角色Id] AS [角色Id], s.[角色名] AS [角色名], s.[描述] AS [描述], s.[上级分类Id] AS [上级分类Id] FROM [FGC_UMV_RI] s", "ViewType": 4 }, "PrimaryKey": [ diff --git a/Tables/用户/角色分类关系视图.json b/Tables/用户/角色分类关系视图.json index 257657e2..c8248fb9 100644 --- a/Tables/用户/角色分类关系视图.json +++ b/Tables/用户/角色分类关系视图.json @@ -40,7 +40,7 @@ "BuiltInViewInfo": { "ViewName": "角色分类关系视图", "SourceTableName": "FGC_UMV_RFR", - "CreateViewSql": "SELECT [Id] AS [Id], [名称] AS [名称], [是否角色] AS [是否角色], [父节点Id] AS [父节点Id], [排序] AS [排序] FROM [FGC_UMV_RFR]", + "CreateViewSql": "SELECT s.[Id] AS [Id], s.[名称] AS [名称], s.[是否角色] AS [是否角色], s.[父节点Id] AS [父节点Id], s.[排序] AS [排序] FROM [FGC_UMV_RFR] s", "ViewType": 7 }, "PrimaryKey": [ diff --git a/Tables/用户/角色拥有权限视图.json b/Tables/用户/角色拥有权限视图.json index 56276710..38b71dfc 100644 --- a/Tables/用户/角色拥有权限视图.json +++ b/Tables/用户/角色拥有权限视图.json @@ -19,7 +19,7 @@ "BuiltInViewInfo": { "ViewName": "角色拥有权限视图", "SourceTableName": "FGC_UMV_RII", - "CreateViewSql": "SELECT [角色Id] AS [角色Id], [拥有权限的角色Id] AS [拥有权限的角色Id] FROM [FGC_UMV_RII]", + "CreateViewSql": "SELECT s.[角色Id] AS [角色Id], s.[拥有权限的角色Id] AS [拥有权限的角色Id] FROM [FGC_UMV_RII] s", "ViewType": 9 }, "PrimaryKey": [ diff --git a/Tables/用户/角色组织关系视图.json b/Tables/用户/角色组织关系视图.json index 6b37cc1f..0f8e9b5d 100644 --- a/Tables/用户/角色组织关系视图.json +++ b/Tables/用户/角色组织关系视图.json @@ -26,7 +26,7 @@ "BuiltInViewInfo": { "ViewName": "角色组织关系视图", "SourceTableName": "FGC_UMV_ORR", - "CreateViewSql": "SELECT [组织Id] AS [组织Id], [角色Id] AS [角色Id], [是否对下级生效] AS [是否对下级生效] FROM [FGC_UMV_ORR]", + "CreateViewSql": "SELECT s.[组织Id] AS [组织Id], s.[角色Id] AS [角色Id], s.[是否对下级生效] AS [是否对下级生效] FROM [FGC_UMV_ORR] s", "ViewType": 8 }, "PrimaryKey": [