entity.creatorName

src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -17,7 +17,9 @@ public class OrderMapperConfigs : IRegister
 
         config.ForType<AddOrderDto, Order>()
             .IgnoreIf((s, d) => s.OrderComplain == null, d => d.OrderComplain)
-            .IgnoreIf((s, d) => s.OrderReport == null, d => d.OrderReport);
+            .IgnoreIf((s, d) => s.OrderReport == null, d => d.OrderReport)
+            .Map(d => d.Additions, s => s.Files)
+            ;
 
         config.ForType<UpdateOrderDto, Order>()
             .Inherits<AddOrderDto, Order>()

src/Hotline.Repository.SqlSugar/DataPermissions/DataPermissionManager.cs

@@ -37,7 +37,7 @@ public class DataPermissionManager : IDataPermissionManager, IScopeDependency
         //return queryFilter;
     }
 
-    public (string? orgId, string? orgCode, string? creatorId, string? areaId) GetDataPermissionOptions()
+    public (string? orgId, string? orgCode, string? creatorId, string? areaId, string? creatorName, string? creatorOrgName) GetDataPermissionOptions()
     {
         //using var scope = _serviceScopeFactory.CreateScope();
         //var userRepository = scope.ServiceProvider.GetRequiredService<IUserRepository>();
@@ -51,7 +51,8 @@ public class DataPermissionManager : IDataPermissionManager, IScopeDependency
         //}
         //return ("", "", _sessionContext.RequiredUserId, "");
         return (_sessionContext.OrgId, _sessionContext.OrgCode,
-            _sessionContext.UserId, _sessionContext.OrgId);
+            _sessionContext.UserId, _sessionContext.OrgId,
+            _sessionContext.UserName, _sessionContext.OrgName);
     }
 
     //private ETableAccessLevel GetCurrentQueryFilter(string[] roles, string entityName)

src/Hotline.Repository.SqlSugar/DataPermissions/IDataPermissionManager.cs

@@ -7,5 +7,5 @@ namespace Hotline.Repository.SqlSugar.DataPermissions;
 public interface IDataPermissionManager
 {
     ETableAccessLevel GetQueryFilter<TEntity>(ISessionContext sessionContext) where TEntity : class, IEntity<string>, IDataPermission, new();
-    (string? orgId, string? orgCode, string? creatorId, string? areaId) GetDataPermissionOptions();
+    (string? orgId, string? orgCode, string? creatorId, string? areaId, string? creatorName, string? creatorOrgName) GetDataPermissionOptions();
 }

src/Hotline.Repository.SqlSugar/Extensions/DataPermissionExtensions.cs

@@ -23,15 +23,15 @@ namespace Hotline.Repository.SqlSugar.Extensions
         public static TEntity InitDatePermission<TEntity>(this TEntity entity, IDataPermissionManager dataPermissionManager)
             where TEntity : class, IEntity<string>, IDataPermission, new()
         {
-            var (orgId, departmentCode, creatorId, areaId) = dataPermissionManager.GetDataPermissionOptions();
-            entity.CreateDataPermission(orgId, departmentCode, creatorId, areaId);
+            var (orgId, departmentCode, creatorId, areaId, creatorName, creatorOrgName) = dataPermissionManager.GetDataPermissionOptions();
+            entity.CreateDataPermission(orgId, departmentCode, creatorId, areaId, creatorName, creatorOrgName);
             return entity;
         }
 
         public static TEntity AssignToCreator<TEntity>(this TEntity entity, IDataPermissionManager dataPermissionManager)
             where TEntity : class, IEntity<string>, IDataPermission, IWorkflow, new()
         {
-            var (orgId, departmentCode, creatorId, areaId) = dataPermissionManager.GetDataPermissionOptions();
+            var (orgId, departmentCode, creatorId, areaId, creatorName, creatorOrgName) = dataPermissionManager.GetDataPermissionOptions();
             entity.Assign(EFlowAssignType.User, creatorId);
             return entity;
         }

src/Hotline/Orders/Order.cs

@@ -1,6 +1,7 @@
 using Hotline.FlowEngine.Workflows;
 using Hotline.Settings.Hotspots;
 using Hotline.Share.Dtos;
+using Hotline.Share.Dtos.File;
 using Hotline.Share.Enums.FlowEngine;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Settings;
@@ -186,6 +187,12 @@ namespace Hotline.Orders
         [SugarColumn(IsNullable = true)]
         public string? PushType { get; set; }
 
+        /// <summary>
+        /// 附件
+        /// </summary>
+        [SugarColumn(ColumnDataType = "json", IsJson = true)]
+        public List<FileDto>? Additions { get; set; } = new();
+
         /// <summary>
         /// 诉求内容
         /// </summary>
@@ -201,10 +208,10 @@ namespace Hotline.Orders
         /// </summary>
         public EOrderStatus Status { get; set; }
 
-		/// <summary>
-		/// 过期状态 //todo 延迟消息更新此字段
-		/// </summary>
-		public EExpiredStatus ExpiredStatus { get; set; }
+        /// <summary>
+        /// 过期状态 //todo 延迟消息更新此字段
+        /// </summary>
+        public EExpiredStatus ExpiredStatus { get; set; }
 
         /// <summary>
         /// 来源，区分省平台或110等其他平台同步过来的工单

src/XF.Domain.Repository/Entity.cs

@@ -14,32 +14,38 @@ public abstract class Entity : IEntity<string>, IDomainEvents, IDataPermission,
     /// <summary>
     /// 组织Id
     /// </summary>
-    [SugarColumn(ColumnDescription = "组织Id", IsNullable = true)]
+    [SugarColumn(ColumnDescription = "组织Id")]
     public string? CreatorOrgId { get; set; }
 
     /// <summary>
     /// 组织编码
     /// </summary>
-    [SugarColumn(ColumnDescription = "组织编码", IsNullable = true)]
+    [SugarColumn(ColumnDescription = "组织编码")]
     public string? CreatorOrgCode { get; set; }
 
+    public string? CreatorOrgName { get; set; }
+
     /// <summary>
     /// 创建人
     /// </summary>
-    [SugarColumn(ColumnDescription = "创建人", IsNullable = true)]
+    [SugarColumn(ColumnDescription = "创建人")]
     public string? CreatorId { get; set; }
 
+    public string? CreatorName { get; set; }
+
     /// <summary>
     /// 赋值部门Id
     /// </summary>
     [SugarColumn(ColumnDescription = "数据权限区域Id", IsNullable = true)]
     public string? AreaId { get; set; }
 
-    public void CreateDataPermission(string? orgId, string? orgCode, string? creatorId, string? areaId)
+    public void CreateDataPermission(string? orgId, string? orgCode, string? creatorId, string? areaId, string? creatorName, string? creatorOrgName)
     {
         CreatorOrgId = orgId;
         CreatorOrgCode = orgCode;
+        CreatorOrgName = creatorOrgName;
         CreatorId = creatorId;
+        CreatorName = creatorName;
         AreaId = areaId;
     }
 

src/XF.Domain/Entities/IDataPermission.cs

@@ -7,10 +7,14 @@ namespace XF.Domain.Entities
 
         string CreatorOrgCode { get; }
 
+        string CreatorOrgName { get; }
+
         string CreatorId { get; }
+        string CreatorName { get; }
 
         string AreaId { get; }
 
-        void CreateDataPermission(string orgId, string orgCode, string creatorId, string? areaId);
+        void CreateDataPermission(string? orgId, string? orgCode, string? creatorId, string? areaId,
+            string? creatorName, string? creatorOrgName);
     }
 }