Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/FillinFromController.cs

@@ -32,7 +32,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult Index()
         {
             var logininfo = LoginUserInfo.Get();
-            ViewBag.isSystem = logininfo.isSystem;
             ViewBag.departmentId = "";
             var Model = departmentIBLL.GetEntity(logininfo.companyId, logininfo.departmentId);
             if (Model.F_Manager == logininfo.realName)

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.cshtml

@@ -3,8 +3,7 @@
     Layout = "~/Views/Shared/_Index.cshtml";
 }
 <script type="text/javascript">
-    var isSystem = '@ViewBag.isSystem';
-    var departmentId= '@ViewBag.departmentId'
+    var departmentId = '@ViewBag.departmentId'
 </script>
 <div class="lr-layout ">
     <div class="lr-layout-center">

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

@@ -305,7 +305,6 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.isSystem = isSystem;
             param.departmentId = departmentId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs

@@ -78,18 +78,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("IsFlag", queryParam["IsFlag"].ToString(), DbType.String);
                     strSql.Append(" AND t.IsFlag = @IsFlag ");
                 }
-                if (queryParam["isSystem"].ToBool() == false)
+                if (!queryParam["departmentId"].IsEmpty())
                 {
-                    if (!queryParam["departmentId"].IsEmpty())
-                    {
-                        dp.Add("FillingDept", queryParam["departmentId"].ToString(), DbType.String);
-                        strSql.Append(" AND t.FillingDept = @FillingDept ");
-                    }
-                    else
-                    {
-                        dp.Add("FillingDept", "undefined11", DbType.String);
-                        strSql.Append(" AND t.FillingDept = @FillingDept ");
-                    }
+                    dp.Add("FillingDept", queryParam["departmentId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.FillingDept = @FillingDept ");
                 }
                 //sql条件
                 if (!queryParam["SqlParameter"].IsEmpty())