证书管理、学员群组、必选修规则新增集团数据归属维护

Tiobon.Core.Model/Base/Ghre/Ghre_StudyRule.Dto.Base.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/3/26 14:43:18  SimonHsiao   初版
+*V0.01  2025/5/29 13:15:15  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -205,4 +205,9 @@ public class Ghre_StudyRuleBase
     /// 培训计划ID
     /// </summary>
     public long? PlanId { get; set; }
+
+    /// <summary>
+    /// 集团数据归属
+    /// </summary>
+    public int? DataBelongID { get; set; }
 }

Tiobon.Core.Model/Models/Ghre/Ghre_StudyRule.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/3/26 14:43:18  SimonHsiao   初版
+*V0.01  2025/5/29 13:15:15  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -206,4 +206,9 @@ public class Ghre_StudyRule : BasePoco
     /// 培训计划ID
     /// </summary>
     public long? PlanId { get; set; }
+
+    /// <summary>
+    /// 集团数据归属
+    /// </summary>
+    public int? DataBelongID { get; set; }
 }

Tiobon.Core.Model/View/Ghre/Ghre_StudyRule.Dto.View.cs

@@ -60,5 +60,6 @@ public class Ghre_StudyRuleDto : Ghre_StudyRule
 
 
     public List<int?> JobIds { get; set; } = new List<int?>();
+    public string DataBelongName { get; set; }
 
 }

Tiobon.Core.Services/BASE/BaseServices.cs

@@ -1,8 +1,4 @@
-using SqlSugar;
-using System.Data;
-using System.Drawing.Drawing2D;
-
-namespace Tiobon.Core.Services.BASE;
+namespace Tiobon.Core.Services.BASE;
 
 /// <summary>
 /// 增删改查基础服务

Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs

@@ -41,6 +41,7 @@ public class Ghre_StaffGroupServices : BaseServices<Ghre_StaffGroup, Ghre_StaffG
                     FROM {entityType.GetEntityTableName()} A";
 
         string conditions = " WHERE 1=1 ";
+        conditions += $" AND dbo.FUserDataBelongPriv ({App.User.ID}, A.DataBelongID, NULL) = 1";
 
         if (IsEnable == true)
             conditions += " AND IsEnable = 1";

Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs

@@ -35,11 +35,12 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
         if (filter.pageSize == 0)
             filter.pageSize = 10000;
 
-        var countSql = @$" SELECT COUNT(1) FROM  Ghre_StudyRule_v";
+        var countSql = @$" SELECT COUNT(1) FROM  Ghre_StudyRule_v A";
         var sql = @$" SELECT *
                     FROM Ghre_StudyRule_v A";
 
         string conditions = " WHERE 1=1 ";
+        conditions += $" AND dbo.FUserDataBelongPriv ({App.User.ID}, A.DataBelongID, NULL) = 1";
 
         if (IsEnable == true)
             conditions += " AND IsEnable = 1";
@@ -104,9 +105,10 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
         var titleIds = new List<int?>();
         var gradeIds = new List<int?>();
         var jobIds = new List<int?>();
-        entitys.ForEach(rule =>
+        entitys.ForEach(async rule =>
         {
             rule.StaffNames = string.Join(",", staffs.Where(o => o.StudyRuleId == rule.Id).Select(o => o.StaffName));
+            rule.DataBelongName = await GetDataBelongName(rule.DataBelongID);
 
             if (!rule.ZoneId.IsNull())
                 rule.ZoneIds = JsonHelper.JsonToObj<List<int?>>(rule.ZoneId);

Tiobon.Core/Tiobon.Core.Model.xml

@@ -8975,6 +8975,11 @@
             培训计划ID
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRuleBase.DataBelongID">
+            <summary>
+            集团数据归属
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleResultBase">
             <summary>
             必选修规则结果 (Dto.Base)
@@ -28552,6 +28557,11 @@
             培训计划ID
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRule.DataBelongID">
+            <summary>
+            集团数据归属
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRuleResult">
             <summary>
             必选修规则结果 (Model)