安全不符合项清单

2026-06-04 10:14:15 +08:00
parent a43a77a180
commit 4e579c7a68
32 changed files with 4611 additions and 97 deletions
@@ -6,8 +6,6 @@

    public static class ProjectUserService
    {
-        public static CNPCDB db = Funs.DB;
-
        /// <summary>
        ///获取项目用户信息
        /// </summary>
@@ -59,8 +57,8 @@
                UnitId = projectUser.UnitId,
                RoleId = projectUser.RoleId,
                IsPost = projectUser.IsPost,
-                MainCNProfessionalId=projectUser.MainCNProfessionalId,
-                ViceCNProfessionalId=projectUser.ViceCNProfessionalId
+                MainCNProfessionalId = projectUser.MainCNProfessionalId,
+                ViceCNProfessionalId = projectUser.ViceCNProfessionalId
            };
            //newProjectUser.RoleName = projectUser.RoleName;
            db.Project_ProjectUser.InsertOnSubmit(newProjectUser);
@@ -154,7 +152,7 @@

        public static List<Sys_User> GetProjectUserByUnitidAndProjectId(string ProjectId, string UnitId, string RoleId)
        {
-            var ids = Funs.DB.Project_ProjectUser.Where(e =>   e.ProjectId == ProjectId &&( UnitId==""|| e.UnitId == UnitId)&&(RoleId==""||e.RoleId.Contains(RoleId)) ).Select(u => u.UserId).ToList();
+            var ids = Funs.DB.Project_ProjectUser.Where(e => e.ProjectId == ProjectId && (UnitId == "" || e.UnitId == UnitId) && (RoleId == "" || e.RoleId.Contains(RoleId))).Select(u => u.UserId).ToList();
            return Funs.DB.Sys_User.Where(u => ids.Contains(u.UserId)).ToList();
        }

@@ -170,5 +168,28 @@
                    where x.ProjectId == ProjectId && y.IdentityCard == IdentityCard
                    select x).FirstOrDefault();
        }
+
+        /// <summary>
+        /// 根据项目Id获取项目所有在岗用户
+        /// </summary>
+        /// <param name="ProjectId"></param>
+        /// <param name="UnitId"></param>
+        /// <param name="RoleId"></param>
+        /// <returns></returns>
+        public static List<Sys_User> GetProjectUserByProjectId(string ProjectId, string UnitId, string RoleId)
+        {
+            var pUsers = Funs.DB.Project_ProjectUser.Where(e => e.ProjectId == ProjectId && e.IsPost == true).ToList();
+            if (!string.IsNullOrWhiteSpace(UnitId))
+            {
+                pUsers = pUsers.Where(x => x.UnitId == UnitId).ToList();
+            }
+            if (!string.IsNullOrWhiteSpace(RoleId))
+            {
+                pUsers = pUsers.Where(x => x.RoleId == RoleId).ToList();
+            }
+            var ids = pUsers.Select(u => u.UserId).ToList();
+            return Funs.DB.Sys_User.Where(u => ids.Contains(u.UserId)).ToList();
+        }
+
    }
 }