页面修改

Edu.Model/CacheModel/UserInfo.cs

@@ -121,5 +121,10 @@ namespace Edu.Model.CacheModel
         /// 上传配置
         /// </summary>
         public object UploadConfig { get; set; }
+
+        /// <summary>
+        /// 留学就业审核对象
+        /// </summary>
+        public object StudyAbroadObj { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Public/PublicModule.cs

@@ -62,5 +62,28 @@ namespace Edu.Module.Public
             return result;
         }
         #endregion
+
+        #region 留学就业审核配置
+
+        /// <summary>
+        /// 获取留学就业审核配置
+        /// </summary>
+        /// <returns></returns>
+        public List<object> GetStudyAbroadListModule()
+        {
+            List<object> list = new List<object>();
+            list.Add(new
+            {
+                Id = Common.Config.StudyAbroadDirectorId,
+                Name = "部门主管审核"
+            });
+            list.Add(new
+            {
+                Id = Common.Config.StudyAbroadManagerId,
+                Name = "部门负责人审核"
+            });
+            return list;
+        }
+        #endregion
     }
 }

Edu.Module.StudyAbroad/StudyAbroadModule.cs

@@ -233,7 +233,7 @@ namespace Edu.Module.StudyAbroad
             {
                 { nameof(RB_StudyAbroad_ViewModel.SaleState),SaleState},
                 { nameof(RB_StudyAbroad_ViewModel.DirectorAuditTime),null},
-                { nameof(RB_StudyAbroad_ViewModel.DirectorId),0},
+                { nameof(RB_StudyAbroad_ViewModel.DirectorId),Common.Config.StudyAbroadDirectorId},
                 { nameof(RB_StudyAbroad_ViewModel.DirectorOpinion),""},
                 { nameof(RB_StudyAbroad_ViewModel.DirectorStatus),0},
             };
@@ -266,7 +266,7 @@ namespace Edu.Module.StudyAbroad
             {
                 fileds.Add(nameof(RB_StudyAbroad_ViewModel.ManagerId), 0);
                 fileds.Add(nameof(RB_StudyAbroad_ViewModel.ManagerOpinion), "");
-                fileds.Add(nameof(RB_StudyAbroad_ViewModel.ManagerStatus), 0);
+                fileds.Add(nameof(RB_StudyAbroad_ViewModel.ManagerStatus), Common.Config.StudyAbroadManagerId);
                 fileds.Add(nameof(RB_StudyAbroad_ViewModel.ManagerAuditTime), null);
             }
             bool flag = studyAbroadRepository.Update(fileds, new WhereHelper(nameof(RB_StudyAbroad_ViewModel.Id), model.Id));

Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs

@@ -54,11 +54,11 @@ WHERE 1=1
                 }
                 if (query.AuditType == 1)
                 {
-                    builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorStatus=0 ");
+                    builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorStatus=0 AND  A.DirectorId={0} ",Common.Config.StudyAbroadDirectorId);
                 }
                 else if (query.AuditType == 2)
                 {
-                    builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorId>0 AND A.DirectorStatus=1 AND A.ManagerStatus=0 ");
+                    builder.AppendFormat(" AND A.SaleState=2 AND A.DirectorId>0 AND A.DirectorStatus=1 AND A.ManagerStatus=0 AND A.ManagerId={0} ",Common.Config.StudyAbroadManagerId);
                 }
                 if (query.SaleState > 0)
                 {

Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs

@@ -457,27 +457,6 @@ namespace Edu.WebApi.Controllers.StudyAbroad
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
-        /// <summary>
-        /// 获取留学就业审核人信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public ApiResult GetStudyAbroadAudit()
-        {
-            List<object> list = new List<object>();
-            list.Add(new
-            {
-                Id = Common.Config.StudyAbroadDirectorId,
-                Name = "部门主管审核"
-            });
-            list.Add(new
-            {
-                Id = Common.Config.StudyAbroadManagerId,
-                Name = "部门负责人审核"
-            });
-            return ApiResult.Success(data: list);
-        }
-
         /// <summary>
         /// 获取留学就业销售状态列表
         /// </summary>

Edu.WebApi/Controllers/User/LoginController.cs

@@ -112,6 +112,7 @@ namespace Edu.WebApi.Controllers.User
                 var actionList = menuModule.GetPostMenuFunctionListModule(model.Post_Id.ToString());
                 //上传配置
                 var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = model.Group_Id, IsDefault = 1 })?.FirstOrDefault();
+               
                 UserInfo obj = new UserInfo
                 {
                     Id = model.Id,
@@ -144,7 +145,8 @@ namespace Edu.WebApi.Controllers.User
                         uploadConfig?.SecretKey,
                         uploadConfig?.SecretId,
                         uploadConfig?.UploadDomain
-                    }
+                    },
+                    StudyAbroadObj=publicModule.GetStudyAbroadListModule()
                 };
                 UserReidsCache.UserInfoSet(Cache.CacheKey.User_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
                 return ApiResult.Success(data: obj);
@@ -182,6 +184,7 @@ namespace Edu.WebApi.Controllers.User
                     //获取功能权限列表
                     var actionList = menuModule.GetPostMenuFunctionListModule(userInfo.PostId.ToString());
                     userInfo.ActionMenuList = actionList?.Select(qitem => new { qitem.FunctionCode, qitem.FunctionName, qitem.MenuName, qitem.MenuUrl });
+                    userInfo.StudyAbroadObj = publicModule.GetStudyAbroadListModule();
                     //上传配置
                     var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = userInfo.Group_Id, IsDefault = 1 })?.FirstOrDefault();
                     userInfo.UploadConfig = new