itcsx/Docker
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ow

Browse Source
This commit is contained in:
owenchen committed 2026-09-07 16:54:19 +08:00
1 parent 599211b895
commit 9bbb8dfd67
9 files changed
+2889 -803
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CloudBuilder/CloudBuilder.Master.Service/FamilyGroupService.auto.cs
+29 -2
View File
@@ -152,6 +152,19 @@ namespace CloudBuilder.Master.Service
IsSharePermission = true,
}).ToArray();
}
else
{
data.FamilyGroupManagers = null;
fgms = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.FamilyName == key && x.UserName == service.UserId).ToArray();
if (fgms != null && fgms.Length > 0)
{
data.FamilyGroupManagers = fgms.Where(x => x.ValidIndc == YesNoPolicy.YES)!.Select(x => new FamilyGroupManagerDisplayData(x)
{ UserLocalName = users!.Where(y => y.UserName == x.UserName).FirstOrDefault()!.UserLocalName }).ToArray();
data.FamilyGroupRequests = fgms.Where(x => x.ValidIndc == YesNoPolicy.NO)!.Select(x => new FamilyGroupManagerDisplayData(x)
{ UserLocalName = users!.Where(y => y.UserName == x.UserName).FirstOrDefault()!.UserLocalName }).ToArray();
}
}
data.IsManager = isManager;
@@ -570,7 +583,7 @@ namespace CloudBuilder.Master.Service
bool isManager = false;
IRepository<FamilyGroupManagerEntity> repositoryFamilyGroupManager = repository.GetRepository<IRepository<FamilyGroupManagerEntity>>();
FamilyGroupManagerEntity[] fgms = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.ManagerIndc == YesNoPolicy.YES && x.FamilyName == key && x.ValidIndc == YesNoPolicy.YES).ToArray();
FamilyGroupManagerEntity[] fgms = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.ManagerIndc == YesNoPolicy.YES && x.UserName == service.UserId && x.FamilyName == key && x.ValidIndc == YesNoPolicy.YES).ToArray();
if (fgms == null || fgms.Length == 0)
{
throw new ValidatedException("您不是管理员,不能解散");
@@ -588,7 +601,7 @@ namespace CloudBuilder.Master.Service
{
IRepository<FamilyGroupManagerEntity> repositoryFamilyGroupManager = repository.GetRepository<IRepository<FamilyGroupManagerEntity>>();
FamilyGroupManagerEntity org = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.FamilyName == manager.FamilyName && x.UserName == service.UserId).FirstOrDefault()!;
if (org != null) { return; }
if (org != null) { throw new ValidatedException("您已申请加入,耐心等待审核。"); }
org = new FamilyGroupManagerEntity();
org.FamilyName = manager.FamilyName;
@@ -623,6 +636,13 @@ namespace CloudBuilder.Master.Service
public void UpdateFamilyGroupManager(FamilyGroupManagerEntity manager)
{
IRepository<FamilyGroupManagerEntity> repositoryFamilyGroupManager = repository.GetRepository<IRepository<FamilyGroupManagerEntity>>();
FamilyGroupManagerEntity[] fgms = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.ManagerIndc == YesNoPolicy.YES && x.UserName == service.UserId && x.FamilyName == manager.FamilyName && x.ValidIndc == YesNoPolicy.YES).ToArray();
if (fgms == null || fgms.Length == 0)
{
throw new ValidatedException("您不是管理员");
}
FamilyGroupManagerEntity org = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.FamilyName == manager.FamilyName && x.UserName == manager.UserName).FirstOrDefault()!;
if (org == null) { return; }
@@ -636,6 +656,13 @@ namespace CloudBuilder.Master.Service
public void DeleteFamilyGroupManager(FamilyGroupManagerEntity manager)
{
IRepository<FamilyGroupManagerEntity> repositoryFamilyGroupManager = repository.GetRepository<IRepository<FamilyGroupManagerEntity>>();
FamilyGroupManagerEntity[] fgms = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.ManagerIndc == YesNoPolicy.YES && x.UserName == service.UserId && x.FamilyName == manager.FamilyName && x.ValidIndc == YesNoPolicy.YES).ToArray();
if (fgms == null || fgms.Length == 0)
{
throw new ValidatedException("您不是管理员");
}
FamilyGroupManagerEntity org = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.FamilyName == manager.FamilyName && x.UserName == manager.UserName).FirstOrDefault()!;
if (org == null) { return; }