1、系统菜单调整；

2、系统看板UI调整； 3、事故事件功能 4、其他
2025-12-10 15:58:02 +08:00
parent 3d00bb7a94
commit 6619f1e004
276 changed files with 131707 additions and 50045 deletions
@@ -383,6 +383,81 @@
                return null;
            }
        }
+        public static List<Model.Base_Project> GetUnEndProjectByUserIdDropDownList(string userId, string needProjectId, string ProjectAttribute, string projectState, string projectName = null)
+        {
+            IQueryable<Model.Base_Project> projects = null;
+            if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
+            {
+                projects = from x in Funs.DB.Base_Project
+                           where x.ProjectAttribute.Contains(ProjectAttribute) && (x.IsDelete == null || x.IsDelete == false)
+                           select x;
+            }
+            else
+            {
+                var getUser = UserService.GetUserByUserId(userId);
+                if (getUser != null)
+                {
+                    var thisUnitId = CommonService.GetThisUnitId();
+                    var getUnit = UnitService.GetUnitByUnitId(getUser.UnitId);
+                    ///// 获取角色类型
+                    //var getRoleP = Funs.DB.Sys_RolePower.FirstOrDefault(x => x.RoleId == getUser.RoleId && x.IsOffice == true);
+                    if (getUser.IsOffice == true)
+                    {
+                        if (getUser.UnitId == thisUnitId)
+                        {
+                            projects = from x in Funs.DB.Base_Project
+                                       where x.ProjectAttribute.Contains(ProjectAttribute) && (x.IsDelete == null || x.IsDelete == false)
+                                       select x;
+                        }
+                        else if (getUnit != null && getUnit.IsBranch == true)
+                        {
+                            projects = from x in Funs.DB.Base_Project
+                                       where x.ProjectAttribute.Contains(ProjectAttribute) && (x.IsDelete == null || x.IsDelete == false) && x.UnitId == getUnit.UnitId
+                                       select x;
+                        }
+                        else
+                        {
+                            projects = from x in Funs.DB.Base_Project
+                                       join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
+                                       where x.ProjectAttribute.Contains(ProjectAttribute) && (x.UnitId == getUser.UnitId || y.UserId == userId)
+                                        && (x.IsDelete == null || x.IsDelete == false)
+                                       select x;
+                        }
+                    }
+                    else
+                    {
+                        projects = from x in Funs.DB.Base_Project
+                                   join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
+                                   where y.UserId == userId && x.ProjectAttribute.Contains(ProjectAttribute)
+                                   && (x.IsDelete == null || x.IsDelete == false)
+                                   select x;
+                    }
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            if (projectState != "0")
+            {
+                if (projectState == "1")
+                {
+                    projects = from x in projects where x.ProjectState == projectState || x.ProjectState == null select x;
+                }
+                else
+                {
+                    projects = from x in projects where x.ProjectState == projectState select x;
+                }
+            }
+
+            if (!string.IsNullOrEmpty(projectName))
+            {
+                projects = from x in projects where x.ProjectName.Contains(projectName) select x;
+            }
+            return (from x in projects
+                    join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                    select x).Distinct().ToList();
+        }

        #region 项目表下拉框
        /// <summary>