Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -35,5 +35,9 @@
         <div class="lr-form-item-title">心理负责人</div>
         <div id="DeptpSychology"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="CdDept">
+        <div class="lr-form-item-title">资助审核人</div>
+        <div id="DeptSubsidizer"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/CdDept/Form.js")

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

@@ -18,6 +18,7 @@ var bootstrap = function ($, learun) {
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#DeptDirector').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
             $('#DeptpSychology').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+            $('#DeptSubsidizer').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -114,6 +114,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "资助审核人", name: "DeptSubsidizer", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_encode',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'DeptId',
                 isMultiselect: true,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdDept/CdDeptEntity.cs

@@ -77,6 +77,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("SYNCFLAG")]
         public bool? SyncFlag { get; set; }
+        /// <summary>
+        /// 资助审核人
+        /// </summary>
+        [Column("DEPTSUBSIDIZER")]
+        public string DeptSubsidizer { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs

@@ -85,10 +85,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     //不查看状态为草稿的记录
                     strSql.Append(" AND t.Status > 0 ");
-                    //二级学院审核专员==系部负责人==登录用户，系统管理员除外
+                    //二级学院审核专员==系部的资助审核人==登录用户，系统管理员除外
                     if (LoginUserInfo.Get().account.ToLower() != "system")
                     {
-                        strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+                        strSql.Append($" and d.DeptSubsidizer='{LoginUserInfo.Get().account}' ");
                     }
                 }
                 if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuFellowship/StuFellowshipService.cs

@@ -132,10 +132,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     //不查看状态为草稿的记录
                     strSql.Append(" AND t.Status > 0 ");
-                    //二级学院审核专员==系部负责人==登录用户，系统管理员除外
+                    //二级学院审核专员==系部的资助审核人==登录用户，系统管理员除外
                     if (LoginUserInfo.Get().account.ToLower() != "system")
                     {
-                        strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+                        strSql.Append($" and d.DeptSubsidizer='{LoginUserInfo.Get().account}' ");
                     }
                 }
                 if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/FamilyEconomy/FamilyEconomyService.cs

@@ -247,10 +247,10 @@ namespace Learun.Application.TwoDevelopment.StudentWork
                 {
                     //不查看状态为草稿的记录
                     strSql.Append(" AND t.Status > 0 ");
-                    //二级学院审核专员==系部负责人==登录用户，系统管理员除外
+                    //二级学院审核专员==系部的资助审核人==登录用户，系统管理员除外
                     if (LoginUserInfo.Get().account.ToLower() != "system")
                     {
-                        strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+                        strSql.Append($" and d.DeptSubsidizer='{LoginUserInfo.Get().account}' ");
                     }
                 }
                 if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "3")//第三步：学工部审核