From 07584b1b7e94ecdcd4de56527cc285f246c0f733 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Wed, 3 Apr 2024 10:23:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=95=99?=
 =?UTF-8?q?=E5=B8=88=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=EF=BC=9A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=BA=E5=B7=B2=E5=AE=A1=E6=A0=B8=E7=9A=84=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EmpInfo/EmpInfoService.cs                      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
index c15069128..31db4bf9b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs	
@@ -881,7 +881,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>().Count();
+                return this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>(x => x.CheckMark == true).Count();
             }
             catch (Exception ex)
             {
@@ -901,16 +901,16 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
         /// </summary>
         /// <param name="type">1按性别，2按岗位类别</param>
         /// <returns></returns>
-        public Dictionary<string,int> GetDicCount(int type)
+        public Dictionary<string, int> GetDicCount(int type)
         {
             try
             {
                 var rs = new Dictionary<string, int>();
-                var query = this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>();
+                var query = this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>(x => x.CheckMark == true);
                 switch (type)
                 {
                     case 2:
-                        var data = query.GroupBy(x => x.EmpSortNo).Select(x=>new Tuple<string, int>(x.Key,x.Count())).ToList();
+                        var data = query.GroupBy(x => x.EmpSortNo).Select(x => new Tuple<string, int>(x.Key, x.Count())).ToList();
                         ConvertName(data, rs);
                         break;
                     default:
@@ -934,7 +934,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
 
         private void ConvertName(List<Tuple<string, int>> data, Dictionary<string, int> rs)
         {
-            if(data.Any())
+            if (data.Any())
             {
                 var detailList = this.BaseRepository().FindList<DataItemDetailEntity>(@"SELECT t.*,t2.F_ItemCode FROM LR_Base_DataItemDetail t
                             INNER JOIN LR_Base_DataItem t2 ON t.F_ItemId = t2.F_ItemId
@@ -942,9 +942,9 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
                 foreach (var item in data)
                 {
                     var dl = detailList.FirstOrDefault(x => x.F_ItemValue == item.Item1);
-                    if(dl!=null)
+                    if (dl != null)
                     {
-                        if(!rs.ContainsKey(dl.F_ItemName))
+                        if (!rs.ContainsKey(dl.F_ItemName))
                         {
                             rs.Add(dl.F_ItemName, item.Item2);
                         }