修复GetInfo方法中的空值处理问题

- 修复MainHealthUser和SubHealthUser字段为空时导致的查询错误 - 添加空值检查，避免在字段为空时执行数据库查询 - 使用安全的方式查询用户姓名，处理用户不存在的情况 - 确保所有用户姓名字段都有默认值，避免null引用异常

修复GetInfo方法中的空值处理问题
- 修复MainHealthUser和SubHealthUser字段为空时导致的查询错误 - 添加空值检查，避免在字段为空时执行数据库查询 - 使用安全的方式查询用户姓名，处理用户不存在的情况 - 确保所有用户姓名字段都有默认值，避免null引用异常
“wangming”
1 parent 8e0493dc
Showing 6 changed files with 140 additions and 2 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs
netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs
@@ -128,5 +128,20 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// 年龄
         /// </summary>
         public string ml { get; set; }
+
+        /// <summary>
+        /// 拓客人员
+        /// </summary>
+        public string expandUser { get; set; }
+
+        /// <summary>
+        /// 主健康师
+        /// </summary>
+        public string mainHealthUser { get; set; }
+
+        /// <summary>
+        /// 副健康师
+        /// </summary>
+        public string subHealthUser { get; set; }
     }
 }
@@ -133,5 +133,37 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// 添加时间
         /// </summary>
         public string createTime { get; set; }
+
+        /// <summary>
+        /// 拓客人员
+        /// </summary>
+        public string expandUser { get; set; }
+
+        /// <summary>
+        /// 拓客人员名称
+        /// </summary>
+        public string expandUserName { get; set; }
+
+        /// <summary>
+        /// 主健康师
+        /// </summary>
+        public string mainHealthUser { get; set; }
+
+        /// <summary>
+        /// 主健康师名称
+        /// </summary>
+        public string mainHealthUserName { get; set; }
+
+        /// <summary>
+        /// 副健康师
+        /// </summary>
+        public string subHealthUser { get; set; }
+
+        /// <summary>
+        /// 副健康师名称
+        /// </summary>
+        public string subHealthUserName { get; set; }
+
+
     }
 }
@@ -159,5 +159,35 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx
         /// 添加时间
         /// </summary>
         public DateTime createTime { get; set; }
+
+        /// <summary>
+        /// 拓客人员
+        /// </summary>
+        public string expandUser { get; set; }
+
+        /// <summary>
+        /// 拓客人员名称
+        /// </summary>
+        public string expandUserName { get; set; }
+
+        /// <summary>
+        /// 主健康师
+        /// </summary>
+        public string mainHealthUser { get; set; }
+
+        /// <summary>
+        /// 主健康师名称
+        /// </summary>
+        public string mainHealthUserName { get; set; }
+
+        /// <summary>
+        /// 副健康师
+        /// </summary>
+        public string subHealthUser { get; set; }
+
+        /// <summary>
+        /// 副健康师名称
+        /// </summary>
+        public string subHealthUserName { get; set; }
     }
 }
@@ -160,5 +160,26 @@ namespace NCC.Extend.Entitys.lq_khxx
         /// </summary>
         [SugarColumn(ColumnName = "F_CreateTime")]
         public DateTime CreateTime { get; set; } = DateTime.Now;
+
+
+        /// <summary>
+        /// 拓客人员
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ExpandUser")]
+        public string ExpandUser { get; set; }
+
+
+        /// <summary>
+        /// 主健康师
+        /// </summary>
+        [SugarColumn(ColumnName = "F_MainHealthUser")]
+        public string MainHealthUser { get; set; }
+
+        /// <summary>
+        ///  副健康师
+        /// </summary>
+        [SugarColumn(ColumnName = "F_SubHealthUser")]
+        public string SubHealthUser { get; set; }
+
     }
 }
@@ -71,6 +71,37 @@ namespace NCC.Extend.LqKhxx
         {
             var entity = await _db.Queryable<LqKhxxEntity>().FirstAsync(p => p.Id == id);
             var output = entity.Adapt<LqKhxxInfoOutput>();
+
+            // 安全查询用户姓名，处理空值情况
+            if (!string.IsNullOrEmpty(entity.ExpandUser))
+            {
+                var expandUser = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.ExpandUser).FirstAsync();
+                output.expandUserName = expandUser?.RealName ?? "";
+            }
+            else
+            {
+                output.expandUserName = "";
+            }
+
+            if (!string.IsNullOrEmpty(entity.MainHealthUser))
+            {
+                var mainHealthUser = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.MainHealthUser).FirstAsync();
+                output.mainHealthUserName = mainHealthUser?.RealName ?? "";
+            }
+            else
+            {
+                output.mainHealthUserName = "";
+            }
+
+            if (!string.IsNullOrEmpty(entity.SubHealthUser))
+            {
+                var subHealthUser = await _db.Queryable<UserEntity>().Where(u => u.Id == entity.SubHealthUser).FirstAsync();
+                output.subHealthUserName = subHealthUser?.RealName ?? "";
+            }
+            else
+            {
+                output.subHealthUserName = "";
+            }
             return output;
         }
         #endregion
@@ -135,6 +166,12 @@ namespace NCC.Extend.LqKhxx
                     yinlsr = it.Yinlsr,
                     ml = it.Ml,
                     createTime = it.CreateTime,
+                    expandUser = it.ExpandUser,
+                    mainHealthUser = it.MainHealthUser,
+                    subHealthUser = it.SubHealthUser,
+                    expandUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.ExpandUser).Select(u => u.RealName),
+                    mainHealthUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.MainHealthUser).Select(u => u.RealName),
+                    subHealthUserName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.SubHealthUser).Select(u => u.RealName),
                 })
                 .MergeTable()
                 .OrderBy(sidx + " " + input.sort)
@@ -329,6 +366,9 @@ namespace NCC.Extend.LqKhxx
                     yinlsr = it.Yinlsr,
                     ml = it.Ml,
                     createTime = it.CreateTime,
+                    expandUser = it.ExpandUser,
+                    mainHealthUser = it.MainHealthUser,
+                    subHealthUser = it.SubHealthUser,
                 })
                 .MergeTable()
                 .OrderBy(sidx + " " + input.sort)
@@ -188,10 +188,10 @@ namespace NCC.Extend.LqTkjlb
                 MemberInfo.Dah = "GK" + DateTime.Now.ToString("yyyyMMddHHmmss");
                 //找到input.expansionUserId的用户信息
                 var userInfo = await _db.Queryable<UserEntity>().Where(u => u.Id == input.expansionUserId).FirstAsync();
-                //判断 岗位是否为健康师，如果是健康师，则设置健康师为负责人
+                //判断 岗位是否为健康师，如果是健康师，则设置拓客人员是健康师
                 if (userInfo.Gw == "健康师")
                 {
-                    MemberInfo.Mrs = input.expansionUserId;
+                    MemberInfo.ExpandUser = input.expansionUserId;
                 }
                 MemberInfo.Gsmd = eventUserInfo.StoreId;
                 var memberResult = await _db.Insertable(MemberInfo).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();