Ver código fonte

任务列表 修改

leiy 11 meses atrás
pai
commit
6b28bdabc2

+ 6 - 7
OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -1085,13 +1085,12 @@ namespace OASystem.API.Controllers
                 {
                     item.TaskerDetails = taskerData.Where(it => it.TAId == item.Id).ToList();
 
-                    //处理任务总状态 And 任务人状态
-
-                    var taskerStatusData = taskerData.Where(it => it.TAId == item.Id && it.TaskCreateUserId != _dto.UserId && it.UserId == _dto.UserId).FirstOrDefault();
-                    if (taskerStatusData != null)
-                    {
-                        item.Status = taskerStatusData.TaskStatus;
-                    }
+                    ////处理任务总状态 And 任务人状态
+                    //var taskerStatusData = taskerData.Where(it => it.TAId == item.Id && it.TaskCreateUserId != _dto.UserId && it.UserId == _dto.UserId).FirstOrDefault();
+                    //if (taskerStatusData != null)
+                    //{
+                    //    item.Status = taskerStatusData.TaskStatus;
+                    //}
                 }
 
 

+ 1 - 1
OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1297,7 +1297,7 @@ namespace OASystem.API.Controllers
                 int depId = 0, postId = 0;
                 if (userData != null) { depId = userData.DepId; postId = userData.JobPostId; }
 
-                bool s = DefaultPostAuth(depId, postId, dto.Id);
+                bool s = DefaultPostAuth(depId, postId, dto.Id, dto.UserId);
                 string str = $"基础页面权限添加失败!";
                 if (s) str = $"基础页面权限添加成功!";
 

+ 3 - 2
OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -38,11 +38,12 @@ namespace OASystem.API.OAMethodLib
         /// <summary>
         /// 默认职位权限 View
         /// </summary>
-        public static bool DefaultPostAuth(int depId,int postId, int userId)
+        public static bool DefaultPostAuth(int depId,int postId, int userId,int createUserId)
         {
             if (depId < 1) return false;
             if (postId < 1) return false;
             if (userId < 1) return false;
+            if (userId < 1) return false;
 
             List<DefaultPostPageAuthView> _defaultData = AppSettingsHelper.Get<DefaultPostPageAuthView>("DefaultPostPageData");
 
@@ -75,7 +76,7 @@ namespace OASystem.API.OAMethodLib
                     UId = userId,
                     SmId = it.SmId,
                     FId = it.FId,
-                    CreateUserId = 4, //管理员
+                    CreateUserId = createUserId, //管理员
                     CreateTime = DateTime.Now,
                     IsDel = 0,
                     IsTemp = 1