ow

CloudBuilder/CloudBuilder.Master/Data/FamilyGroupData.cs

@@ -17,6 +17,8 @@ namespace CloudBuilder.Master.Data
         public bool IsManager { get; set; } = false;
         public bool IsOpen { get; set; } = false;
         public bool IsAdd { get; set; } = false;
+        // 公开成员目录权限：开群组后所有目录对全体成员开放（不再逐目录分配）
+        public bool IsOpenDir { get; set; } = false;
 
 
         public FamilyGroupFolderDisplayData[]? FamilyGroupFolders { get; set; }

CloudBuilder/CloudBuilder.Master/Data/FamilyGroupManagerDisplayData.cs

@@ -29,6 +29,16 @@ namespace CloudBuilder.Master.Data
 
         public const string DB_USER_LOCAL_NAME = "user_local_name";
 
+        /// <summary>成员手机号（security_user.user_mobile；成员视图不带，FindByKey 回查用户档案填充）</summary>
+        public string? UserMobile { get; set; }
+
+        public const string USER_MOBILE = "UserMobile";
+
+        /// <summary>成员头像访问地址（security_user.user_icon_img_path 经 PackAvatarUrl 拼装；空=未上传，前端占位）</summary>
+        public string? AvatarUrl { get; set; }
+
+        public const string AVATAR_URL = "AvatarUrl";
+
         public const string IS_MANAGER = "IsManager";
 
         public bool IsManager { get; set; }

CloudBuilder/CloudBuilder.Master/Entity/CloudBuilderMasterRegistEntity.auto.cs

@@ -117,7 +117,8 @@ builder.Entity<FamilyTreePermissionUserViewEntity>(eb => { eb.HasNoKey(); });
 
 
 builder.Entity<DmsFileUsageViewEntity>(eb => { eb.HasNoKey(); });
-            //***END***
+            
+//***END***
         }
     }
 }

CloudBuilder/CloudBuilder.Master/Entity/FamilyGroupEntity.auto.cs

@@ -14,56 +14,60 @@ namespace CloudBuilder.Master.Entity
     {
     }
 
-    [Column("add_indc")]
-    public string AddIndc  { get; set; }
-    [Column("created_by")]
-    public string CreatedBy  { get; set; }
     [Column("created_datetime")]
     public DateTime CreatedDatetime  { get; set; }
-    [Column("expire_datetime")]
-    public Nullable<DateTime> ExpireDatetime  { get; set; }
-    [Column("family_local_name")]
-    public string? FamilyLocalName  { get; set; }
+    [Column("created_by")]
+    public string CreatedBy  { get; set; }
+    [Column("updated_datetime")]
+    public DateTime UpdatedDatetime  { get; set; }
+    [Column("updated_by")]
+    public string UpdatedBy  { get; set; }
     [Key]
     [Column("family_name")]
     public string FamilyName  { get; set; }
+    [Column("family_local_name")]
+    public string? FamilyLocalName  { get; set; }
     [Column("notice")]
     public string? Notice  { get; set; }
+    [Column("expire_datetime")]
+    public Nullable<DateTime> ExpireDatetime  { get; set; }
     [Column("open_indc")]
     public string OpenIndc  { get; set; }
-    [Column("updated_by")]
-    public string UpdatedBy  { get; set; }
-    [Column("updated_datetime")]
-    public DateTime UpdatedDatetime  { get; set; }
+    [Column("add_indc")]
+    public string AddIndc  { get; set; }
     [Column("valid_indc")]
     public string ValidIndc  { get; set; }
+    [Column("open_dir_indc")]
+    public string? OpenDirIndc  { get; set; }
 
-    public const string ADD_INDC = "AddIndc";
-    public const string CREATED_BY = "CreatedBy";
     public const string CREATED_DATETIME = "CreatedDatetime";
-    public const string EXPIRE_DATETIME = "ExpireDatetime";
-    public const string FAMILY_LOCAL_NAME = "FamilyLocalName";
-    public const string FAMILY_NAME = "FamilyName";
-    public const string NOTICE = "Notice";
-    public const string OPEN_INDC = "OpenIndc";
-    public const string UPDATED_BY = "UpdatedBy";
+    public const string CREATED_BY = "CreatedBy";
     public const string UPDATED_DATETIME = "UpdatedDatetime";
+    public const string UPDATED_BY = "UpdatedBy";
+    public const string FAMILY_NAME = "FamilyName";
+    public const string FAMILY_LOCAL_NAME = "FamilyLocalName";
+    public const string NOTICE = "Notice";
+    public const string EXPIRE_DATETIME = "ExpireDatetime";
+    public const string OPEN_INDC = "OpenIndc";
+    public const string ADD_INDC = "AddIndc";
     public const string VALID_INDC = "ValidIndc";
+    public const string OPEN_DIR_INDC = "OpenDirIndc";
 
     public const string DB_NAME_FAMILY_GROUP = "family_group";
-    public const string DB_NAME_FIELDS="add_indc,created_by,created_datetime,expire_datetime,family_local_name,family_name,notice,open_indc,updated_by,updated_datetime,valid_indc";
+    public const string DB_NAME_FIELDS="created_datetime,created_by,updated_datetime,updated_by,family_name,family_local_name,notice,expire_datetime,open_indc,add_indc,valid_indc,open_dir_indc";
 
-    public const string DB_ADD_INDC = "add_indc";
-    public const string DB_CREATED_BY = "created_by";
     public const string DB_CREATED_DATETIME = "created_datetime";
-    public const string DB_EXPIRE_DATETIME = "expire_datetime";
-    public const string DB_FAMILY_LOCAL_NAME = "family_local_name";
-    public const string DB_FAMILY_NAME = "family_name";
-    public const string DB_NOTICE = "notice";
-    public const string DB_OPEN_INDC = "open_indc";
-    public const string DB_UPDATED_BY = "updated_by";
+    public const string DB_CREATED_BY = "created_by";
     public const string DB_UPDATED_DATETIME = "updated_datetime";
+    public const string DB_UPDATED_BY = "updated_by";
+    public const string DB_FAMILY_NAME = "family_name";
+    public const string DB_FAMILY_LOCAL_NAME = "family_local_name";
+    public const string DB_NOTICE = "notice";
+    public const string DB_EXPIRE_DATETIME = "expire_datetime";
+    public const string DB_OPEN_INDC = "open_indc";
+    public const string DB_ADD_INDC = "add_indc";
     public const string DB_VALID_INDC = "valid_indc";
+    public const string DB_OPEN_DIR_INDC = "open_dir_indc";
 
     private string ProviderName { get; set; }
 
@@ -84,24 +88,25 @@ namespace CloudBuilder.Master.Entity
             throw new NullReferenceException("Source entity is null.");
         }
 
-        this.AddIndc =  source.AddIndc;
-        this.CreatedBy =  source.CreatedBy;
         this.CreatedDatetime =  source.CreatedDatetime;
-        this.ExpireDatetime =  source.ExpireDatetime;
-        this.FamilyLocalName =  source.FamilyLocalName;
-        this.FamilyName =  source.FamilyName;
-        this.Notice =  source.Notice;
-        this.OpenIndc =  source.OpenIndc;
-        this.UpdatedBy =  source.UpdatedBy;
+        this.CreatedBy =  source.CreatedBy;
         this.UpdatedDatetime =  source.UpdatedDatetime;
+        this.UpdatedBy =  source.UpdatedBy;
+        this.FamilyName =  source.FamilyName;
+        this.FamilyLocalName =  source.FamilyLocalName;
+        this.Notice =  source.Notice;
+        this.ExpireDatetime =  source.ExpireDatetime;
+        this.OpenIndc =  source.OpenIndc;
+        this.AddIndc =  source.AddIndc;
         this.ValidIndc =  source.ValidIndc;
+        this.OpenDirIndc =  source.OpenDirIndc;
 
         if (includeSystemFields)
         {
-        this.CreatedBy =  source.CreatedBy;
         this.CreatedDatetime =  source.CreatedDatetime;
-        this.UpdatedBy =  source.UpdatedBy;
+        this.CreatedBy =  source.CreatedBy;
         this.UpdatedDatetime =  source.UpdatedDatetime;
+        this.UpdatedBy =  source.UpdatedBy;
         }
     }