公务出访Bug修复

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

@@ -59,7 +59,7 @@ namespace OASystem.Domain.Entities.Resource
         /// <summary>
         /// 公务形式
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(120)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int OfficialForm { get; set; }
         /// <summary>
         /// 公务方背景

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

@@ -42,12 +42,14 @@ namespace OASystem.Infrastructure.Repositories.Resource
                     Regex r = new Regex("And");
                     sqlWhere = r.Replace(sqlWhere, "Where", 1);
                 }
-                string sql = string.Format(@"select *,(select CnName from Sys_Users where o.CreateUserId=Id) as CreateUserName,(select Name from Sys_SetData
-                                            where Id=o.OfficialForm) as OfficialFormName from Res_OfficialActivities o {0} order by o.CreateTime desc", sqlWhere);
+                string sql = string.Format(@"select *,(select CnName from Sys_Users where o.CreateUserId=Id) as CreateUserName,OfficialForm
+    from Res_OfficialActivities o {0} order by o.CreateTime desc", sqlWhere);
                 List<OfficialActivitiesView> OfficialActivities = await _sqlSugar.SqlQueryable<OfficialActivitiesView>(sql).ToListAsync();
                 List<Sys_SetData> data = await _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 38).ToListAsync();
                 if (OfficialActivities.Count != 0)
                 {
+                    List<Sys_SetData> sdList = Query<Sys_SetData>(s => s.STid == 38).ToList();
+
                     if (dto.PageSize == 0 && dto.PageIndex == 0)
                     {
                         foreach (var temp in OfficialActivities)
@@ -59,6 +61,17 @@ namespace OASystem.Infrastructure.Repositories.Resource
                             {
                                 temp.Date = dt.ToString("yyyy-MM-dd HH:mm");
                             }
+
+                            //2024年4月26日 17:43  -蒋金辰 -出访形式
+                            Sys_SetData tempForm = sdList.FirstOrDefault(s => s.Id == temp.OfficialForm);
+                            if (tempForm != null)
+                            {
+                                temp.OfficialFormName = tempForm.Name;
+                            }
+                            else
+                            {
+                                temp.OfficialFormName = "未知";
+                            }
                         }
 
                         result = new Result() { Code = 0, Msg = "查询成功！", Data = OfficialActivities };
@@ -83,6 +96,18 @@ namespace OASystem.Infrastructure.Repositories.Resource
                                 {
                                     OfficialActivities[RowIndex].Date = dt.ToString("yyyy-MM-dd HH:mm");
                                 }
+
+                                //2024年4月26日 17:43  -蒋金辰 -出访形式
+                                Sys_SetData tempForm = sdList.FirstOrDefault(s => s.Id == OfficialActivities[RowIndex].OfficialForm);
+                                if (tempForm != null)
+                                {
+                                    OfficialActivities[RowIndex].OfficialFormName = tempForm.Name;
+                                }
+                                else
+                                {
+                                    OfficialActivities[RowIndex].OfficialFormName = "未知";
+                                }
+
                                 _OfficialActivities.Add(OfficialActivities[RowIndex]);
                             }
                             else