+1

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1687,17 +1687,8 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
 
             var data = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 38).ToList();
 
-            var natureData = _sqlSugar.Queryable<Sys_SetData>()
-                                      .Where(a => a.IsDel == 0 && a.STid == 86)
-                                      .Select(x => new
-                                      {
-                                          x.Id,
-                                          x.Name
-                                      })
-                                      .ToList();
-
             var _DeleFile = _sqlSugar.Queryable<Grp_DeleFile>().Where(a => a.Diid == dto.DiId && a.IsDel == 0 && a.Category == 970).ToList();
-            return Ok(JsonView(true, "查询成功！", new { Delegation = groupInfos, SetData = data, Nature = natureData, DeleFile = _DeleFile }));
+            return Ok(JsonView(true, "查询成功！", new { Delegation = groupInfos, SetData = data,DeleFile = _DeleFile }));
         }
 
         /// <summary>

OASystem/OASystem.Domain/Dtos/Resource/OfficialActivitiesDto.cs

@@ -144,9 +144,8 @@ namespace OASystem.Domain.Dtos.Resource
 
         /// <summary>
         /// 公务性质
-        /// setdata 外键Id 
         /// </summary>
-        public int NatureId { get; set; }
+        public string Nature { get; set; }
 
 
     }

OASystem/OASystem.Domain/Entities/Resource/Res_OfficialActivities.cs

@@ -164,9 +164,8 @@ namespace OASystem.Domain.Entities.Resource
 
         /// <summary>
         /// 公务性质
-        /// setdata 外键Id 
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int NatureId { get; set; } 
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(250)")]
+        public string Nature { get; set; } 
     }
 }

OASystem/OASystem.Domain/ViewModels/Resource/OfficialActivitiesView.cs

@@ -30,11 +30,6 @@ namespace OASystem.Domain.ViewModels.Resource
             }
         }
 
-        /// <summary>
-        /// 性质
-        /// </summary>
-        public string NatureName { get; set; }
-
         public string CreateUserName { get; set; }
         public string OfficialFormName { get; set; }
     }

OASystem/OASystem.Infrastructure/Repositories/Resource/OfficialActivitiesRepository.cs

@@ -44,7 +44,6 @@ namespace OASystem.Infrastructure.Repositories.Resource
             }
             string sql = string.Format(@"
 SELECT
-  sd1.Name AS NatureName,
   *,
   u.CnName AS CreateUserName,
   sd.Name AS OfficialFormName
@@ -52,7 +51,6 @@ FROM
   Res_OfficialActivities o
   LEFT JOIN Sys_SetData sd ON o.OfficialForm = sd.Id
   LEFT JOIN Sys_Users u ON o.CreateUserId = u.Id
-  LEFT JOIN Sys_SetData sd1 ON o.NatureId = sd1.Id
 {0}
 ORDER BY
   o.CreateTime desc
@@ -272,7 +270,7 @@ FROM
                     IsSubmitApproval = dto.IsSubmitApproval,
                     EmailOrWeChat = dto.EmailOrWeChat,
                     Website = dto.Website,
-                    NatureId = dto.NatureId,
+                    Nature = dto.Nature,
                 });
                 if (res)
                 {