Merge branch '娄底高职分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 娄底高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Form.cshtml

@@ -74,7 +74,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="HiringRegistration">
         <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
-        <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"/>
+        <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="HiringRegistration">
         <div class="lr-form-item-title">有何特长</div>
@@ -96,6 +96,10 @@
         <div class="lr-form-item-title">E-Mail</div>
         <input id="Email" type="text" class="form-control" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="HiringRegistration">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="FilePath"></div>
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="HiringRegistration">
         <div class="lr-form-item-title">简历</div>
         <textarea id="Resume" class="form-control" style="height:60px;"></textarea>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Form.js

@@ -17,6 +17,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             //$('#Gender').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#Head').lrUploader();
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Index.js

@@ -109,6 +109,33 @@ var bootstrap = function ($, learun) {
                     { label: "邮政编码", name: "PostalCode", width: 100, align: "left" },
                     { label: "联系电话", name: "Mobile", width: 100, align: "left" },
                     { label: "实践与成绩", name: "Achievement", width: 100, align: "left" },
+                    {
+                        label: "附件", name: "FilePath", width: 500, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            $.ajax({
+                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                data: { folderId: value },
+                                type: 'GET',
+                                dataType: "json",
+                                async: false,
+                                cache: false,
+                                success: function (res) {
+                                    var bb = '';
+                                    //$.each(res.data, function (i, item) {
+                                    //    bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
+                                    //})
+                                    $.each(res.data, function (i, item) {
+                                        bb += '<span onclick="downLoad(\'' +
+                                            item.F_Id +
+                                            '\')" style="color:blue">' +
+                                            item.F_FileName.substring(0, item.F_FileName.indexOf(".")) +
+                                            '</span>,&nbsp;&nbsp;&nbsp;';
+                                    })
+                                    callback(bb);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'ID',
                 isPage: true,
@@ -127,3 +154,11 @@ var bootstrap = function ($, learun) {
     };
     page.init();
 }
+function downLoad(fileId, fileTwo) {
+    if (fileTwo) {
+        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+        });
+    }
+    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+} 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TalentsJoinInfo/Form.cshtml

@@ -87,14 +87,22 @@
         <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
         <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="IDCard" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="TalentsJoinInfo">
+    <div class="col-xs-4 lr-form-item" data-table="TalentsJoinInfo">
         <div class="lr-form-item-title">联系电话</div>
         <input id="Phone" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="TalentsJoinInfo">
+    <div class="col-xs-4 lr-form-item" data-table="TalentsJoinInfo">
         <div class="lr-form-item-title">手机</div>
         <input id="Mobile" type="text" class="form-control" />
     </div>
+    <div class="col-xs-4 lr-form-item" data-table="TalentsJoinInfo">
+        <div class="lr-form-item-title">邮箱</div>
+        <input id="Email" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TalentsJoinInfo">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="FilePath"></div>
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="TalentsJoinInfo">
         <div class="lr-form-item-title">简历</div>
         <textarea id="Resume" class="form-control" style="height:100px;"></textarea>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TalentsJoinInfo/Form.js

@@ -16,6 +16,7 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#Head').lrUploader();
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TalentsJoinInfo/Index.js

@@ -84,9 +84,13 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "民族", name: "Nationality", width: 100, align: "left"},
                     { label: "文化程度", name: "CultureDegree", width: 100, align: "left"},
-                    { label: "婚姻状况", name: "Marriage", width: 100, align: "left"},
-                    { label: "毕业院校", name: "WilliamsSchool", width: 100, align: "left"},
-                    { label: "所学专业", name: "Major", width: 100, align: "left"},
+                    { label: "婚姻状况", name: "Marriage", width: 100, align: "left" },
+                    { label: "第一学历毕业院校", name: "WilliamsSchool", width: 100, align: "left" },
+                    { label: "第一学历专业", name: "Major", width: 100, align: "left" },
+                    { label: "硕士毕业院校", name: "MasterSchool", width: 100, align: "left" },
+                    { label: "硕士专业", name: "MasterMajor", width: 100, align: "left" },
+                    { label: "博士毕业院校", name: "DoctorSchool", width: 100, align: "left"},
+                    { label: "博士专业", name: "DoctorMajor", width: 100, align: "left"},
                     {
                         label: "毕业时间", name: "GraduateTime", width: 100, align: "left",
                     },
@@ -105,8 +109,36 @@ var bootstrap = function ($, learun) {
                     { label: "通讯地址", name: "Address", width: 100, align: "left"},
                     { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left"},
                     { label: "联系电话", name: "Phone", width: 100, align: "left"},
-                    { label: "手机", name: "Mobile", width: 100, align: "left"},
-                    { label: "简历", name: "Resume", width: 100, align: "left"},
+                    { label: "手机", name: "Mobile", width: 100, align: "left" },
+                    { label: "邮箱", name: "Email", width: 100, align: "left" },
+                    { label: "简历", name: "Resume", width: 100, align: "left" },
+                    {
+                        label: "附件", name: "FilePath", width: 500, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            $.ajax({
+                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                data: { folderId: value },
+                                type: 'GET',
+                                dataType: "json",
+                                async: false,
+                                cache: false,
+                                success: function (res) {
+                                    var bb = '';
+                                    //$.each(res.data, function (i, item) {
+                                    //    bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
+                                    //})
+                                    $.each(res.data, function (i, item) {
+                                        bb += '<span onclick="downLoad(\'' +
+                                            item.F_Id +
+                                            '\')" style="color:blue">' +
+                                            item.F_FileName.substring(0, item.F_FileName.indexOf(".")) +
+                                            '</span>,&nbsp;&nbsp;&nbsp;';
+                                    })
+                                    callback(bb);
+                                }
+                            });
+                        }
+                    }, 
                 ],
                 mainId:'ID',
                 isPage: true
@@ -123,3 +155,11 @@ var bootstrap = function ($, learun) {
     };
     page.init();
 }
+function downLoad(fileId, fileTwo) {
+    if (fileTwo) {
+        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+        });
+    }
+    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.cshtml

@@ -71,6 +71,10 @@
         <div class="lr-form-item-title">手机号码</div>
         <input id="Mobile" type="text" class="form-control" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="WorkStaff">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="FilePath"></div>
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="WorkStaff">
         <div class="lr-form-item-title">个人简历</div>
         <textarea id="Resume" class="form-control" style="height:80px;"></textarea>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.js

@@ -59,6 +59,7 @@ var bootstrap = function ($, learun) {
                 isEdit: true,
                 height: 200
             });
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Index.js

@@ -55,7 +55,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/WorkStaff/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/WorkStaff/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -72,9 +72,10 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/WorkStaff/GetPageList',
                 headData: [
-                    { label: "姓名", name: "Name", width: 100, align: "left"},
-                    { label: "性别", name: "Gender", width: 100, align: "left"},
-                    { label: "民族", name: "Nationality", width: 100, align: "left"},
+                    { label: "姓名", name: "Name", width: 100, align: "left" },
+                    { label: "性别", name: "Gender", width: 100, align: "left" },
+                    { label: "身份证号", name: "IdentityCardNo", width: 120, align: "left" },
+                    { label: "民族", name: "Nationality", width: 100, align: "left" },
                     {
                         label: "出生年月日", name: "Birthday", width: 100, align: "left",
                         formatter: function (cellvalue) {
@@ -93,28 +94,56 @@ var bootstrap = function ($, learun) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }
                     },
-                    { label: "籍贯", name: "Origin", width: 100, align: "left"},
-                    { label: "健康状况", name: "HealthStatus", width: 100, align: "left"},
-                    { label: "有何专长", name: "Speciality", width: 100, align: "left"},
-                    { label: "现单位及职务", name: "NowComPany", width: 100, align: "left"},
-                    { label: "报名岗位", name: "ApplyPost", width: 100, align: "left"},
-                    { label: "全日制教育", name: "TimeEducation", width: 100, align: "left"},
-                    { label: "毕业院校及专业", name: "T_SchoolMajor", width: 100, align: "left"},
-                    { label: "在职教育", name: "ServiceEducation", width: 100, align: "left"},
-                    { label: "通讯地址", name: "Address", width: 100, align: "left"},
-                    { label: "手机号码", name: "Mobile", width: 100, align: "left"},
-                    { label: "个人简历", name: "Resume", width: 100, align: "left"},
-                    { label: "奖惩情况", name: "RandP", width: 100, align: "left"},
-                    { label: "近三年年度考核情况", name: "Triennium", width: 100, align: "left"},
+                    { label: "籍贯", name: "Origin", width: 100, align: "left" },
+                    { label: "健康状况", name: "HealthStatus", width: 100, align: "left" },
+                    { label: "有何专长", name: "Speciality", width: 100, align: "left" },
+                    { label: "现单位及职务", name: "NowComPany", width: 100, align: "left" },
+                    { label: "报名岗位", name: "ApplyPost", width: 100, align: "left" },
+                    { label: "全日制教育", name: "TimeEducation", width: 100, align: "left" },
+                    { label: "毕业院校", name: "T_School", width: 100, align: "left" },
+                    { label: "所属专业", name: "T_Major", width: 100, align: "left" },
+                    { label: "在职教育", name: "ServiceEducation", width: 100, align: "left" },
+                    { label: "通讯地址", name: "Address", width: 100, align: "left" },
+                    { label: "手机号码", name: "Mobile", width: 100, align: "left" },
+                    { label: "个人简历", name: "Resume", width: 100, align: "left" },
+                    { label: "奖惩情况", name: "RandP", width: 100, align: "left" },
+                    { label: "近三年年度考核情况", name: "Triennium", width: 100, align: "left" },
+                    {
+                        label: "附件", name: "FilePath", width: 500, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            $.ajax({
+                                url: '/LR_SystemModule/Annexes/GetAnnexesFileList',
+                                data: { folderId: value },
+                                type: 'GET',
+                                dataType: "json",
+                                async: false,
+                                cache: false,
+                                success: function (res) {
+                                    var bb = '';
+                                    //$.each(res.data, function (i, item) {
+                                    //    bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
+                                    //})
+                                    $.each(res.data, function(i, item) {
+                                        bb += '<span onclick="downLoad(\'' +
+                                            item.F_Id +
+                                            '\')" style="color:blue">' +
+                                            item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
+                                            '</span>,&nbsp;&nbsp;&nbsp;';
+                                    })
+                                    callback(bb);
+                                }
+                            });
+                        }
+                    }, 
                 ],
-                mainId:'ID',
+                mainId: 'ID',
                 isPage: true
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {
@@ -122,3 +151,11 @@ var bootstrap = function ($, learun) {
     };
     page.init();
 }
+function downLoad(fileId, fileTwo) {
+    if (fileTwo) {
+        top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () {
+
+        });
+    }
+    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' });
+} 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs

@@ -136,52 +136,52 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
         {
             var userinfo = LoginUserInfo.Get();
             Pagination paginationobj = new Pagination();
-            var newsList = noticeIBLL.GetList(keyword, userinfo.userId, categoryId);
-            var newsListOfSelf = new List<NewsEntity>();
-
-            foreach (var newsitemEntity in newsList)
-            {
-                if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
-                {
-                    if (!string.IsNullOrEmpty(userinfo.postIds))
-                    {
-                        if (userinfo.postIds.Contains(","))
-                        {
-                            foreach (var postid in userinfo.postIds.Split(','))
-                            {
-                                if (newsitemEntity.F_SendPostId.Contains(postid))
-                                {
-                                    newsListOfSelf.Add(newsitemEntity);
-                                    break;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
-                            {
-                                newsListOfSelf.Add(newsitemEntity);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
-                    {
-                        if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
-                        {
-                            newsListOfSelf.Add(newsitemEntity);
-                        }
-                    }
-                    else
-                    {
-                        newsListOfSelf.Add(newsitemEntity);
-                    }
-                }
-            }
-
-            return JsonResult(newsListOfSelf);
+            var newsList = noticeIBLL.GetList(keyword, categoryId);
+            //var newsListOfSelf = new List<NewsEntity>();
+
+            //foreach (var newsitemEntity in newsList)
+            //{
+            //    if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
+            //    {
+            //        if (!string.IsNullOrEmpty(userinfo.postIds))
+            //        {
+            //            if (userinfo.postIds.Contains(","))
+            //            {
+            //                foreach (var postid in userinfo.postIds.Split(','))
+            //                {
+            //                    if (newsitemEntity.F_SendPostId.Contains(postid))
+            //                    {
+            //                        newsListOfSelf.Add(newsitemEntity);
+            //                        break;
+            //                    }
+            //                }
+            //            }
+            //            else
+            //            {
+            //                if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
+            //                {
+            //                    newsListOfSelf.Add(newsitemEntity);
+            //                }
+            //            }
+            //        }
+            //    }
+            //    else
+            //    {
+            //        if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
+            //        {
+            //            if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
+            //            {
+            //                newsListOfSelf.Add(newsitemEntity);
+            //            }
+            //        }
+            //        else
+            //        {
+            //            newsListOfSelf.Add(newsitemEntity);
+            //        }
+            //    }
+            //}
+
+            return JsonResult(newsList);
         }
         /// <summary>
         /// 查看通知公告
@@ -193,53 +193,53 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
         {
             var userinfo = LoginUserInfo.Get();
             Pagination paginationobj = new Pagination();
-            var newsList = noticeIBLL.GetList(keyword, userinfo.userId, categoryId).
+            var newsList = noticeIBLL.GetList(keyword, categoryId).
             Where(a => a.F_Status == "2");
-            var newsListOfSelf = new List<NewsEntity>();
-
-            foreach (var newsitemEntity in newsList)
-            {
-                if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
-                {
-                    if (!string.IsNullOrEmpty(userinfo.postIds))
-                    {
-                        if (userinfo.postIds.Contains(","))
-                        {
-                            foreach (var postid in userinfo.postIds.Split(','))
-                            {
-                                if (newsitemEntity.F_SendPostId.Contains(postid))
-                                {
-                                    newsListOfSelf.Add(newsitemEntity);
-                                    break;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
-                            {
-                                newsListOfSelf.Add(newsitemEntity);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
-                    {
-                        if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
-                        {
-                            newsListOfSelf.Add(newsitemEntity);
-                        }
-                    }
-                    else
-                    {
-                        newsListOfSelf.Add(newsitemEntity);
-                    }
-                }
-            }
-
-            return JsonResult(newsListOfSelf);
+            //var newsListOfSelf = new List<NewsEntity>();
+
+            //foreach (var newsitemEntity in newsList)
+            //{
+            //    if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
+            //    {
+            //        if (!string.IsNullOrEmpty(userinfo.postIds))
+            //        {
+            //            if (userinfo.postIds.Contains(","))
+            //            {
+            //                foreach (var postid in userinfo.postIds.Split(','))
+            //                {
+            //                    if (newsitemEntity.F_SendPostId.Contains(postid))
+            //                    {
+            //                        newsListOfSelf.Add(newsitemEntity);
+            //                        break;
+            //                    }
+            //                }
+            //            }
+            //            else
+            //            {
+            //                if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
+            //                {
+            //                    newsListOfSelf.Add(newsitemEntity);
+            //                }
+            //            }
+            //        }
+            //    }
+            //    else
+            //    {
+            //        if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
+            //        {
+            //            if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
+            //            {
+            //                newsListOfSelf.Add(newsitemEntity);
+            //            }
+            //        }
+            //        else
+            //        {
+            //            newsListOfSelf.Add(newsitemEntity);
+            //        }
+            //    }
+            //}
+
+            return JsonResult(newsList);
         }
         /// <summary>
         /// 获取实体数据

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs

@@ -32,56 +32,56 @@ namespace Learun.Application.WebApi.Modules
         {
             var userinfo = LoginUserInfo.Get();
             Pagination paginationobj = new Pagination();
-             var newsList = noticeIBLL.GetList("", userinfo.userId,(Request.Query["F_CategoryId"]!=null?Request.Query["F_CategoryId"].ToString():""));
-            var newsListOfSelf = new List<NewsEntity>();
+             var newsList = noticeIBLL.GetList("",(Request.Query["F_CategoryId"]!=null?Request.Query["F_CategoryId"].ToString():""));
+            //var newsListOfSelf = new List<NewsEntity>();
 
-            foreach (var newsitemEntity in newsList)
-            {
-                if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
-                {
-                    if (!string.IsNullOrEmpty(userinfo.postIds))
-                    {
-                        if (userinfo.postIds.Contains(","))
-                        {
-                            foreach (var postid in userinfo.postIds.Split(','))
-                            {
-                                if (newsitemEntity.F_SendPostId.Contains(postid))
-                                {
-                                    newsListOfSelf.Add(newsitemEntity);
-                                    break;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
-                            {
-                                newsListOfSelf.Add(newsitemEntity);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
-                    {
-                        if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
-                        {
-                            newsListOfSelf.Add(newsitemEntity);
-                        }
-                    }
-                    else
-                    {
-                        newsListOfSelf.Add(newsitemEntity);
-                    }
-                }
-            }
+            //foreach (var newsitemEntity in newsList)
+            //{
+            //    if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
+            //    {
+            //        if (!string.IsNullOrEmpty(userinfo.postIds))
+            //        {
+            //            if (userinfo.postIds.Contains(","))
+            //            {
+            //                foreach (var postid in userinfo.postIds.Split(','))
+            //                {
+            //                    if (newsitemEntity.F_SendPostId.Contains(postid))
+            //                    {
+            //                        newsListOfSelf.Add(newsitemEntity);
+            //                        break;
+            //                    }
+            //                }
+            //            }
+            //            else
+            //            {
+            //                if (newsitemEntity.F_SendPostId.Contains(userinfo.postIds))
+            //                {
+            //                    newsListOfSelf.Add(newsitemEntity);
+            //                }
+            //            }
+            //        }
+            //    }
+            //    else
+            //    {
+            //        if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
+            //        {
+            //            if (newsitemEntity.F_SendDeptId.Contains(userinfo.departmentId))
+            //            {
+            //                newsListOfSelf.Add(newsitemEntity);
+            //            }
+            //        }
+            //        else
+            //        {
+            //            newsListOfSelf.Add(newsitemEntity);
+            //        }
+            //    }
+            //}
             var jsonData = new
             {
-                rows = newsListOfSelf,
-                total = newsListOfSelf.Count,
+                rows = newsList,
+                total = newsList.Count,
                 page = 0,
-                records = newsListOfSelf.Count
+                records = newsList.Count
             };
             return Success(jsonData);
         }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/RecruiterPeopleApi.cs

@@ -166,6 +166,22 @@ namespace Learun.Application.WebApi
         {
             var model = this.GetReqData<ReqFormEntity>();
             WorkStaffEntity entity = model.strEntity.ToObject<WorkStaffEntity>();
+            var models = workStaffIBLL.GetIDCard(entity.IdentityCardNo);
+
+            if (string.IsNullOrEmpty(model.keyValue))
+            {
+                if (models != null)
+                {
+                    return Fail("身份证号已存在！");
+                }
+            }
+            else
+            {
+                if (models != null && models.ID != model.keyValue)
+                {
+                    return Fail("身份证号已存在！");
+                }
+            }
             workStaffIBLL.SaveEntity(model.keyValue, entity, entity.WorkStaffSonEntities);
             return Success("保存成功！");
         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs

@@ -121,11 +121,11 @@ namespace Learun.Application.OA
         /// </summary>
         /// <param name="keyword">关键词</param>
         /// <returns></returns>
-        public IEnumerable<NewsEntity> GetList(string keyword, string userId, string categoryId = null)
+        public IEnumerable<NewsEntity> GetList(string keyword, string categoryId = null)
         {
             try
             {
-                return noticeService.GetList(keyword, userId, categoryId);
+                return noticeService.GetList(keyword, categoryId);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs

@@ -49,7 +49,7 @@ namespace Learun.Application.OA
         /// </summary>
         /// <param name="keyword">关键词</param>
         /// <returns></returns>
-        IEnumerable<NewsEntity> GetList(string keyword, string userId,string categoryId=null);
+        IEnumerable<NewsEntity> GetList(string keyword,string categoryId=null);
 
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs

@@ -154,21 +154,55 @@ namespace Learun.Application.OA
         /// </summary>
         /// <param name="keyword">关键词</param>
         /// <returns></returns>
-        public IEnumerable<NewsEntity> GetList(string keyword, string userId, string categoryId = null)
+        public IEnumerable<NewsEntity> GetList(string keyword, string categoryId = null)
         {
             try
             {
+                var userinfo = LoginUserInfo.Get();
+                var userId = userinfo.userId;
+                var deptId = userinfo.departmentId;
+                var postIds = userinfo.postIds;
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT t.*,r.RNewsId,r.RTime FROM LR_OA_News t ");
                 strSql.Append(" left join LR_OA_NewsRead r on t.F_NewsId = r.NewsId and r.RUserId=@userId ");
-                strSql.Append(" WHERE t.F_TypeId = 2 and t.F_DeleteMark=0 ");
+                strSql.Append(" WHERE t.F_TypeId = 2 and t.F_DeleteMark=0  and t.F_EnabledMark=1 ");
+                strSql.Append($@" and (
+((t.F_SendDeptId is null or len(t.F_SendDeptId)=0) and (t.F_SendPostId is null  or len(t.F_SendPostId)=0))
+");
+                if (!string.IsNullOrEmpty(deptId))
+                {
+                    strSql.Append($"  or (t.F_SendDeptId is not null and t.F_SendDeptId like '%{deptId}%')");
+                }
+                if (!string.IsNullOrEmpty(postIds))
+                {
+                    strSql.Append(" or (t.F_SendPostId is not null and ");
+                    if (postIds.Contains(","))
+                    {
+                        string postidSql = " (";
+                        foreach (var postId in postIds)
+                        {
+                            postidSql += $" t.F_SendPostId like '%{postId}%' or";
+                        }
+
+                        postidSql = postidSql.Substring(0, postidSql.LastIndexOf("or")) + ")";
+                        strSql.Append(postidSql);
+                    }
+                    else
+                    {
+                        strSql.Append($"  t.F_SendPostId like '%{postIds}%'");
+                    }
+
+                    strSql.Append(")");
+                }
+
+                strSql.Append(") ");
                 if (!string.IsNullOrEmpty(categoryId))
                 {
-                    strSql.Append($" AND F_CategoryId = '{categoryId}'");
+                    strSql.Append($" AND t.F_CategoryId = '{categoryId}'");
                 }
                 if (!string.IsNullOrEmpty(keyword))
                 {
-                    strSql.Append(" AND F_FullHead like @keyword");
+                    strSql.Append(" AND t.F_FullHead like @keyword");
                 }
                 strSql.Append("  ORDER BY t.F_ReleaseTime DESC ");
                 return this.BaseRepository().FindList<NewsEntity>(strSql.ToString(), new { keyword = "%" + keyword + "%", userId = userId });

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HiringRegistration/HiringRegistrationEntity.cs

@@ -70,16 +70,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("MAJOR")]
         public string Major { get; set; }
         /// <summary>
-        /// 资格
+        /// 职称
         /// </summary>
         [Column("QUALIFICATION")]
         public string Qualification { get; set; }
         /// <summary>
+        /// 资格
+        /// </summary>
+        [Column("NVQ")]
+        public string NVQ { get; set; }
+        /// <summary>
         /// 取得时间
         /// </summary>
         [Column("GETTIME")]
         public DateTime? GetTime { get; set; }
         /// <summary>
+        /// 获取时间
+        /// </summary>
+        [Column("GRADUATIONTIME")]
+        public DateTime? GraduationTime { get; set; }
+        /// <summary>
         /// 户籍所在地
         /// </summary>
         [Column("DOMICILE")]
@@ -143,7 +153,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// CreateTime
         /// </summary>
         [Column("CREATETIME")]
-        public string CreateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
         /// <summary>
         /// Remark
         /// </summary>
@@ -154,6 +164,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("EDUCATION")]
         public string Education { get; set; }
+        /// <summary>
+        ///  FilePath
+        /// </summary>
+        [Column("FILEPATH")]
+        public string FilePath { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HiringRegistration/HiringRegistrationService.cs

@@ -173,6 +173,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 else
                 {
                     entity.Create();
+                    entity.CreateTime = DateTime.Now;
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TalentsJoinInfo/TalentsJoinInfoEntity.cs

@@ -149,6 +149,36 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("REMARK")]
         public string Remark { get; set; }
+        /// <summary>
+        /// Email
+        /// </summary>
+        [Column("EMAIL")]
+        public string Email { get; set; }
+        /// <summary>
+        ///  FilePath
+        /// </summary>
+        [Column("FILEPATH")]
+        public string FilePath { get; set; }
+        /// <summary>
+        ///  FilePath
+        /// </summary>
+        [Column("MASTERSCHOOL")]
+        public string MasterSchool { get; set; }
+        /// <summary>
+        ///  FilePath
+        /// </summary>
+        [Column("MASTERMAJOR")]
+        public string MasterMajor { get; set; }
+        /// <summary>
+        ///  FilePath
+        /// </summary>
+        [Column("DOCTORSCHOOL")]
+        public string DoctorSchool { get; set; }
+        /// <summary>
+        ///  FilePath
+        /// </summary>
+        [Column("DOCTORMAJOR")]
+        public string DoctorMajor { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffBLL.cs

@@ -66,7 +66,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
+        /// <summary>
+        /// 获取WorkStaff表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public WorkStaffEntity GetIDCard(string keyValue)
+        {
+            try
+            {
+                return workStaffService.GetIDCard(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffEntity.cs

@@ -36,6 +36,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("HEAD")]
         public string Head { get; set; }
         /// <summary>
+        /// 身份证号
+        /// </summary>
+        [Column("IDENTITYCARDNO")]
+        public string IdentityCardNo { get; set; }
+        /// <summary>
         /// 民族
         /// </summary>
         [Column("NATIONALITY")]
@@ -86,20 +91,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("TIMEEDUCATION")]
         public string TimeEducation { get; set; }
         /// <summary>
-        /// 毕业院校系及专业
+        /// 毕业院校
+        /// </summary>
+        [Column("T_SCHOOL")]
+        public string T_School { get; set; }
+        /// <summary>
+        /// 所学专业
         /// </summary>
-        [Column("T_SCHOOLMAJOR")]
-        public string T_SchoolMajor { get; set; }
+        [Column("T_MAJOR")]
+        public string T_Major { get; set; }
+
         /// <summary>
         /// 在职教育
         /// </summary>
         [Column("SERVICEEDUCATION")]
         public string ServiceEducation { get; set; }
         /// <summary>
-        /// 毕业院校系及专业
+        /// 毕业院校系
         /// </summary>
-        [Column("S_SCHOOLMAJOR")]
-        public string S_SchoolMajor { get; set; }
+        [Column("S_SCHOOL")]
+        public string S_School { get; set; }
+        /// <summary>
+        /// 所属专业
+        /// </summary>
+        [Column("S_MAJOR")]
+        public string S_Major { get; set; }
         /// <summary>
         /// 通讯地址
         /// </summary>
@@ -130,6 +146,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("REMARK")]
         public string Remark { get; set; }
+        /// <summary>
+        ///  FilePath
+        /// </summary>
+        [Column("FILEPATH")]
+        public string FilePath { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffIBLL.cs

@@ -27,6 +27,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         WorkStaffEntity GetWorkStaffEntity(string keyValue);
+        /// <summary>
+        /// 获取WorkStaff表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        WorkStaffEntity GetIDCard(string keyValue);
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffService.cs

@@ -91,6 +91,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取WorkStaff表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public WorkStaffEntity GetIDCard(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<WorkStaffEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据
@@ -139,6 +162,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 else
                 {
                     entity.Create();
+                    entity.CreateTime = DateTime.Now;
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }
             }