调整带流程的通知公告

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

@@ -16,6 +16,7 @@ using Microsoft.AspNet.SignalR.Client;
 using Microsoft.Owin.Logging;
 using Newtonsoft.Json;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.TwoDevelopment.Permission;
 
 namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
 {
@@ -36,6 +37,9 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
         private DataItemIBLL dataItemIbll = new DataItemBLL();
         private DepartmentIBLL departmentIbll = new DepartmentBLL();
         private Sys_InformationPushIBLL sys_InformationPushIBLL = new Sys_InformationPushBLL();
+
+        private DepartmentReleasePermissionsIBLL departmentReleasePermissionsIbll =
+            new DepartmentReleasePermissionsBLL();
         #region  视图功能
         /// <summary>
         /// 管理页面
@@ -249,15 +253,16 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
             return JsonResult(data);
         }
 
-        public ActionResult GetNoticeCategoryByDepartment(string departmentId)
+        public ActionResult GetNoticeCategoryByDepartment(string userId)
         {
 
             var typeList = dataItemIbll.GetDetailList("NoticeCategory");
-            var departmentEntity = departmentIbll.GetEntity(departmentId);
+            var permissionsEntity = departmentReleasePermissionsIbll.GetTypesByUserId(userId);
+
             List<object> list = new List<object>();
-            if (departmentEntity != null)
+            if (permissionsEntity != null)
             {
-                var typetext = departmentEntity.NoticeCategory?.Split(',');
+                var typetext = permissionsEntity.Permission?.Split(',');
 
                 foreach (var item in typetext)
                 {
@@ -273,6 +278,31 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
 
         }
 
+
+        //public ActionResult GetNoticeCategoryByDepartment(string departmentId)
+        //{
+
+        //    var typeList = dataItemIbll.GetDetailList("NoticeCategory");
+        //    var departmentEntity = departmentIbll.GetEntity(departmentId);
+        //    List<object> list = new List<object>();
+        //    if (departmentEntity != null)
+        //    {
+        //        var typetext = departmentEntity.NoticeCategory?.Split(',');
+
+        //        foreach (var item in typetext)
+        //        {
+        //            var entity = typeList.FirstOrDefault(a => a.F_ItemValue.Equals(item));
+        //            if (entity != null)
+        //            {
+        //                list.Add(new { text = entity.F_ItemName, value = entity.F_ItemValue });
+        //            }
+        //        }
+
+        //    }
+        //    return JsonResult(list);
+
+        //}
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js

@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
             var loginInfo = top.learun.clientdata.get(['userinfo']);
             //公告类别
             $('#F_CategoryId').lrselect({
-                url: top.$.rootUrl + '/LR_OAModule/Notice/GetNoticeCategoryByDepartment?departmentId=' + loginInfo.departmentId,
+                url: top.$.rootUrl + '/LR_OAModule/Notice/GetNoticeCategoryByDepartment?userId=' + loginInfo.userId,
                 text: "text",
                 value: "value",
                 select: function (item) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.cshtml

@@ -32,6 +32,7 @@
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;<span class="lrlt">录入</span></a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;<span class="lrlt">修改</span></a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;<span class="lrlt">删除</span></a>
+                        <a id="lr_permission" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;<span class="lrlt">公告发布权限设置</span></a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js

@@ -74,6 +74,22 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 公告发布权限设置
+            $('#lr_permission').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('F_DepartmentId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '权限设置',
+                        url: top.$.rootUrl + '/Permission/DepartmentReleasePermissions/Index?departmentId=' + keyValue,
+                        width: 700,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
         },
         inittree: function () {
             $('#companyTree').lrtree({

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -7496,6 +7496,7 @@
     <None Include="Properties\PublishProfiles\FolderProfile2.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile3.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile4.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile5.pubxml" />
     <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" />
   </ItemGroup>
   <ItemGroup>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs

@@ -175,7 +175,7 @@ namespace Learun.Application.OA
 
         public void ChangeStatusByProcessId(string parameterProcessId, int status)
         {
-            if (status == 2)
+            if (status == 2|| status == 0)
             {
                 try
                 {
@@ -183,7 +183,7 @@ namespace Learun.Application.OA
                         .FindEntity<NewsEntity>(a => a.F_ProgressId == parameterProcessId);
                     if (null != newEntity)
                     {
-                        newEntity.F_Status = "2";
+                        newEntity.F_Status = status.ToString();
                     }
 
                     this.BaseRepository().Update(newEntity);