From 150862dd9e485a92d8ce281f2ca864550f15df43 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Thu, 9 Oct 2025 14:16:18 +0800 Subject: [PATCH] 修复GetInfo方法中的空值处理问题 --- netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs | 15 +++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs | 32 ++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs | 30 ++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs | 21 +++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs | 40 ++++++++++++++++++++++++++++++++++++++++ netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs | 4 ++-- 6 files changed, 140 insertions(+), 2 deletions(-) diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs index 5a3e6d2..8da0f79 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs @@ -128,5 +128,20 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx /// 年龄 /// public string ml { get; set; } + + /// + /// 拓客人员 + /// + public string expandUser { get; set; } + + /// + /// 主健康师 + /// + public string mainHealthUser { get; set; } + + /// + /// 副健康师 + /// + public string subHealthUser { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs index 4776a96..736f2d1 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs @@ -133,5 +133,37 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx /// 添加时间 /// public string createTime { get; set; } + + /// + /// 拓客人员 + /// + public string expandUser { get; set; } + + /// + /// 拓客人员名称 + /// + public string expandUserName { get; set; } + + /// + /// 主健康师 + /// + public string mainHealthUser { get; set; } + + /// + /// 主健康师名称 + /// + public string mainHealthUserName { get; set; } + + /// + /// 副健康师 + /// + public string subHealthUser { get; set; } + + /// + /// 副健康师名称 + /// + public string subHealthUserName { get; set; } + + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs index 8906310..01cb500 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs @@ -159,5 +159,35 @@ namespace NCC.Extend.Entitys.Dto.LqKhxx /// 添加时间 /// public DateTime createTime { get; set; } + + /// + /// 拓客人员 + /// + public string expandUser { get; set; } + + /// + /// 拓客人员名称 + /// + public string expandUserName { get; set; } + + /// + /// 主健康师 + /// + public string mainHealthUser { get; set; } + + /// + /// 主健康师名称 + /// + public string mainHealthUserName { get; set; } + + /// + /// 副健康师 + /// + public string subHealthUser { get; set; } + + /// + /// 副健康师名称 + /// + public string subHealthUserName { get; set; } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs index cd4b4c9..d81941f 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_khxx/LqKhxxEntity.cs @@ -160,5 +160,26 @@ namespace NCC.Extend.Entitys.lq_khxx /// [SugarColumn(ColumnName = "F_CreateTime")] public DateTime CreateTime { get; set; } = DateTime.Now; + + + /// + /// 拓客人员 + /// + [SugarColumn(ColumnName = "F_ExpandUser")] + public string ExpandUser { get; set; } + + + /// + /// 主健康师 + /// + [SugarColumn(ColumnName = "F_MainHealthUser")] + public string MainHealthUser { get; set; } + + /// + /// 副健康师 + /// + [SugarColumn(ColumnName = "F_SubHealthUser")] + public string SubHealthUser { get; set; } + } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs index 74b3f10..780225a 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs @@ -71,6 +71,37 @@ namespace NCC.Extend.LqKhxx { var entity = await _db.Queryable().FirstAsync(p => p.Id == id); var output = entity.Adapt(); + + // 安全查询用户姓名，处理空值情况 + if (!string.IsNullOrEmpty(entity.ExpandUser)) + { + var expandUser = await _db.Queryable().Where(u => u.Id == entity.ExpandUser).FirstAsync(); + output.expandUserName = expandUser?.RealName ?? ""; + } + else + { + output.expandUserName = ""; + } + + if (!string.IsNullOrEmpty(entity.MainHealthUser)) + { + var mainHealthUser = await _db.Queryable().Where(u => u.Id == entity.MainHealthUser).FirstAsync(); + output.mainHealthUserName = mainHealthUser?.RealName ?? ""; + } + else + { + output.mainHealthUserName = ""; + } + + if (!string.IsNullOrEmpty(entity.SubHealthUser)) + { + var subHealthUser = await _db.Queryable().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().Where(u => u.Id == it.ExpandUser).Select(u => u.RealName), + mainHealthUserName = SqlFunc.Subqueryable().Where(u => u.Id == it.MainHealthUser).Select(u => u.RealName), + subHealthUserName = SqlFunc.Subqueryable().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) diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs index e025ff6..5e14cac 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTkjlbService.cs @@ -188,10 +188,10 @@ namespace NCC.Extend.LqTkjlb MemberInfo.Dah = "GK" + DateTime.Now.ToString("yyyyMMddHHmmss"); //找到input.expansionUserId的用户信息 var userInfo = await _db.Queryable().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(); -- libgit2 0.21.4