From e49734298d6286aa21995f38e624c13ccb4330b8 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Thu, 2 Jan 2025 16:13:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ghrh/Ghrh_ResumeTemplatePreviewController.cs            | 4 +++-
 Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs            | 2 +-
 Tiobon.Core.Services/Ghrh/Ghrh_ResumeEduBGServices.cs       | 2 +-
 Tiobon.Core.Services/Ghrh/Ghrh_ResumeHomeServices.cs        | 2 +-
 Tiobon.Core.Services/Ghrh/Ghrh_ResumeLicenceServices.cs     | 2 +-
 Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs            | 6 +++---
 Tiobon.Core.Services/Ghrh/Ghrh_ResumeTrainingServices.cs    | 2 +-
 Tiobon.Core.Services/Ghrh/Ghrh_ResumeWorkExpServices.cs     | 2 +-
 Tiobon.Core.Services/Ghrs/Ghrs_LangKeyServices.cs           | 6 ++----
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs
index 702491e3..5b7b7247 100644
--- a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs
+++ b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs
@@ -304,8 +304,10 @@ END";
             var value = entity.GetPropertyValue(x);
             if (x == "RemarkSz")
             {
-                if (value.ToString().IsNotEmptyOrNull())
+                if (value != null)
+                {
                     value = "<div>" + value.ToString().Replace("\n", "</br>") + "</div>";
+                }
                 dicts.Add(x, value);
 
             }
diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
index 0b88d758..e500cc0c 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
@@ -876,7 +876,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
                 inOrOut = items.Where(x => x.ParaDetailName == inOrOut).FirstOrDefault()?.ParaDetailNo ?? "In";
             }
 
-            if (isOPen.IsNullOrEmpty() || isOPen == "否")
+            if (isOPen.IsNullOrEmpty())
                 isOPen = "是";
 
             List<long?> courseClassId1 = [courseClassId];
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeEduBGServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeEduBGServices.cs
index f5c79c4b..b4f27c0a 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeEduBGServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeEduBGServices.cs
@@ -177,7 +177,7 @@ public class Ghrh_ResumeEduBGServices : BaseServices<Ghrh_ResumeEduBG, Ghrh_Resu
                     isExistError = true;
                     continue;
                 }
-                if (column.DataSourceType.IsNullOrEmpty())
+                if (column.DataSourceType.IsNullOrEmpty() && value.IsNotEmptyOrNull())
                 {
                     if (column.DataType == "int" || column.DataType == "decimal")
                     {
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeHomeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeHomeServices.cs
index ea2a8f82..57505703 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeHomeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeHomeServices.cs
@@ -171,7 +171,7 @@ public class Ghrh_ResumeHomeServices : BaseServices<Ghrh_ResumeHome, Ghrh_Resume
                     isExistError = true;
                     continue;
                 }
-                if (column.DataSourceType.IsNullOrEmpty())
+                if (column.DataSourceType.IsNullOrEmpty() && value.IsNotEmptyOrNull())
                 {
                     if (column.DataType == "int" || column.DataType == "decimal")
                     {
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeLicenceServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeLicenceServices.cs
index 0a3518bb..75220e91 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeLicenceServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeLicenceServices.cs
@@ -167,7 +167,7 @@ public class Ghrh_ResumeLicenceServices : BaseServices<Ghrh_ResumeLicence, Ghrh_
                     isExistError = true;
                     continue;
                 }
-                if (column.DataSourceType.IsNullOrEmpty())
+                if (column.DataSourceType.IsNullOrEmpty() && value.IsNotEmptyOrNull())
                 {
                     if (column.DataType == "int" || column.DataType == "decimal")
                     {
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index a372109f..6401b3f9 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -872,7 +872,7 @@ ORDER BY A.SortNo ASC";
         var entity = await QueryById(id);
         string statementRemark = string.Empty;
         #region Column
-        string sql = @"DECLARE @ID   BIGINT = 1
+        string sql = @$"DECLARE @ID   BIGINT = 1
 
 BEGIN
    DECLARE
@@ -889,7 +889,7 @@ BEGIN
    FROM (SELECT a.ID,
                 a.ID ResumeTemplateInfoGroupID,
                 b.ID ResumeInfoGroupID,
-                [dbo].[FLangKeyToValue](b.MKey,3,b.GroupName) tabName,
+                [dbo].[FLangKeyToValue](b.MKey,{langId},b.GroupName) tabName,
                 b.GroupType tabKey,
                 b.TableName,
                 b.TablePKIDName,                                   --  是否可挑选栏位
@@ -4120,7 +4120,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                     isExistError = true;
                     continue;
                 }
-                if (column.DataSourceType.IsNullOrEmpty())
+                if (column.DataSourceType.IsNullOrEmpty() && value.IsNotEmptyOrNull())
                 {
                     if (column.DataType == "int" || column.DataType == "decimal")
                     {
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTrainingServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTrainingServices.cs
index 6207a9e8..4202a844 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTrainingServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTrainingServices.cs
@@ -170,7 +170,7 @@ public class Ghrh_ResumeTrainingServices : BaseServices<Ghrh_ResumeTraining, Ghr
                     isExistError = true;
                     continue;
                 }
-                if (column.DataType.IsNullOrEmpty())
+                if (column.DataSourceType.IsNullOrEmpty() && value.IsNotEmptyOrNull())
                 {
                     if (column.DataType == "int" || column.DataType == "decimal")
                     {
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeWorkExpServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeWorkExpServices.cs
index 1af9a131..29d5271e 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeWorkExpServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeWorkExpServices.cs
@@ -169,7 +169,7 @@ public class Ghrh_ResumeWorkExpServices : BaseServices<Ghrh_ResumeWorkExp, Ghrh_
                     isExistError = true;
                     continue;
                 }
-                if (column.DataSourceType.IsNullOrEmpty())
+                if (column.DataSourceType.IsNullOrEmpty() && value.IsNotEmptyOrNull())
                 {
                     if (column.DataType == "int" || column.DataType == "decimal")
                     {
diff --git a/Tiobon.Core.Services/Ghrs/Ghrs_LangKeyServices.cs b/Tiobon.Core.Services/Ghrs/Ghrs_LangKeyServices.cs
index 102dfc45..729d6ed0 100644
--- a/Tiobon.Core.Services/Ghrs/Ghrs_LangKeyServices.cs
+++ b/Tiobon.Core.Services/Ghrs/Ghrs_LangKeyServices.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Logging.Abstractions;
-
-namespace Tiobon.Core.Services;
+namespace Tiobon.Core.Services;
 
 /// <summary>
 /// Ghrs_LangKey (服务)
@@ -19,7 +17,7 @@ public class Ghrs_LangKeyServices : BaseServices<Ghrs_LangKey, Ghrs_LangKeyDto,
     {
 
         var entity =await base.QuerySingle(9801);
-        for (int i = 100; i < 146; i++)
+        for (int i = 146; i < 201; i++)
         {
             entity.CreateTime = DateTime.Now;
             entity.UpdateTime = null;