ow

CloudBuilder/CloudBuilder.Master.Service/FamilyTreeService.auto.cs

@@ -396,12 +396,18 @@ namespace CloudBuilder.Master.Service
         [UnitOfWork]
         public FamilyTreeData Update(FamilyTreeData data)
         {
-            FamilyTreeEntity d = repository.DetachedEntities.Where(x => x.TreeName == data.FamilyTree.TreeName).FirstOrDefault();
-            if (d == null)
+            FamilyTreeEntity d = null;
+            if (data.FamilyTree.TreeName != data.FamilyTree.OrgTreeName)
             {
-                throw new ValidatedException("家族名称不存在.");
+                d = repository.DetachedEntities.Where(x => x.TreeName == data.FamilyTree.TreeName).FirstOrDefault();
+                if (d != null)
+                {
+                    throw new ValidatedException("家族名称已存在.");
+                }
             }
 
+            d = repository.DetachedEntities.Where(x => x.TreeId == data.FamilyTree.TreeId).FirstOrDefault();
+
             Validate(data.FamilyTree);
 
             ObjectCopyHelper.Copy(data.FamilyTree, d);