From 3d7c01003dfcaff405ed7f805b1bef43c35a9ff6 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Wed, 19 Aug 2026 10:05:39 +0800
Subject: [PATCH] 1

---
 SGGL/BLL/SysManage/UserService.cs | 41 ++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs
index 8876ba3c..b60c7115 100644
--- a/SGGL/BLL/SysManage/UserService.cs
+++ b/SGGL/BLL/SysManage/UserService.cs
@@ -8,7 +8,7 @@ namespace BLL
 
     public static class UserService
     {
-        
+
 
         /// <summary>
         /// 获取用户信息
@@ -196,7 +196,7 @@ namespace BLL
                 db.SubmitChanges();
             }
         }
-        public static void UpdatePassword(string userId     )
+        public static void UpdatePassword(string userId)
         {
             Model.CNPCDB db = Funs.DB;
             Model.Sys_User m = db.Sys_User.FirstOrDefault(e => e.UserId == userId);
@@ -293,7 +293,8 @@ namespace BLL
                     db.SubmitChanges();
                 }
             }
-            catch (Exception e) { 
+            catch (Exception e)
+            {
             }
         }
 
@@ -394,7 +395,7 @@ namespace BLL
                 {
                     getPUser = (from x in db.Project_ProjectUser
                                 join u in db.Project_ProjectUnit on new { x.ProjectId, x.UnitId } equals new { u.ProjectId, u.UnitId }
-                                where x.ProjectId == projectId && (u.UnitId == unitId)  
+                                where x.ProjectId == projectId && (u.UnitId == unitId)
                                 select x).ToList();
                 }
                 else
@@ -409,7 +410,7 @@ namespace BLL
                     foreach (var item in getPUser)
                     {
                         List<string> roleIdList = Funs.GetStrListByStr(item.RoleId, ',');
-                        var getRoles = db.Sys_Role.FirstOrDefault(x =>roleIdList.Contains(x.RoleId));
+                        var getRoles = db.Sys_Role.FirstOrDefault(x => roleIdList.Contains(x.RoleId));
                         if (getRoles != null)
                         {
                             string userName = RoleService.getRoleNamesRoleIds(item.RoleId) + "-" + UserService.GetUserNameByUserId(item.UserId);
@@ -442,7 +443,7 @@ namespace BLL
                 {
                     users = (from x in db.Sys_User
                              join z in db.Sys_Role on x.RoleId equals z.RoleId
-                             where x.IsPost == true 
+                             where x.IsPost == true
                              orderby x.UserCode
                              select new Model.SpSysUserItem
                              {
@@ -505,7 +506,7 @@ namespace BLL
             using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
             {
                 var users = (from x in db.Sys_User
-                             where x.IsPost == true && x.UserId != Const.hfnbdId  
+                             where x.IsPost == true && x.UserId != Const.hfnbdId
                              orderby x.UserName
                              select x).ToList();
                 if (!string.IsNullOrEmpty(projectId))
@@ -530,7 +531,7 @@ namespace BLL
             using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
             {
                 var users = (from x in db.Sys_User
-                             where x.IsPost == true && x.UserId != Const.hfnbdId  
+                             where x.IsPost == true && x.UserId != Const.hfnbdId
                              orderby x.UserName
                              select x).ToList();
                 if (!string.IsNullOrEmpty(projectId))
@@ -584,7 +585,7 @@ namespace BLL
                 else
                 {
                     list = (from x in db.Sys_User
-                            where x.UserId != BLL.Const.hfnbdId 
+                            where x.UserId != BLL.Const.hfnbdId
                             orderby x.UserName
                             select x).ToList();
 
@@ -597,12 +598,12 @@ namespace BLL
                 return list;
             }
         }
-        
+
         /// <summary>
         /// 根据项目号和角色Id获取用户下拉选项
         /// </summary>
         /// <returns></returns>
-        public static List<Model.Sys_User> GetUserListByProjectIdUnitIdRoleId(string projectId,string unitId, string roleIds)
+        public static List<Model.Sys_User> GetUserListByProjectIdUnitIdRoleId(string projectId, string unitId, string roleIds)
         {
             using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
             {
@@ -615,7 +616,7 @@ namespace BLL
                         list = (from x in db.Sys_User
                                 join y in db.Project_ProjectUser
                                 on x.UserId equals y.UserId
-                                where y.ProjectId == projectId && x.UnitId == unitId && listRoles.Contains(y.RoleId) 
+                                where y.ProjectId == projectId && x.UnitId == unitId && listRoles.Contains(y.RoleId)
                                 orderby x.UserName
                                 select x).ToList();
                     }
@@ -632,7 +633,7 @@ namespace BLL
                 else
                 {
                     list = (from x in db.Sys_User
-                            where   x.UnitId == unitId && x.UserId != BLL.Const.hfnbdId  
+                            where x.UnitId == unitId && x.UserId != BLL.Const.hfnbdId
                             orderby x.UserName
                             select x).ToList();
 
@@ -731,7 +732,7 @@ namespace BLL
         {
             dropName.DataValueField = "UserId";
             dropName.DataTextField = "UserName";
-            dropName.DataSource = BLL.UserService.GetUserListByProjectIdUnitIdRoleId(projectId,unitId, roleIds);
+            dropName.DataSource = BLL.UserService.GetUserListByProjectIdUnitIdRoleId(projectId, unitId, roleIds);
             dropName.DataBind();
             if (isShowPlease)
             {
@@ -1596,7 +1597,12 @@ namespace BLL
             }
         }
 
-
+        /// <summary>
+        /// 重置登录密码
+        /// </summary>
+        /// <param name="unitId"></param>
+        /// <param name="idCard"></param>
+        /// <returns></returns>
         public static string getInitialPassword(string unitId, string idCard)
         {
             string prefixValue = Const.PasswordPrefixValue;
@@ -1620,14 +1626,15 @@ namespace BLL
             {
                 if (idCard.Length > 4)
                 {
-                    suffixValue = idCard.Substring(idCard.Length-4, 4);
+                    suffixValue = idCard.Substring(idCard.Length - 4, 4);
                 }
                 else
                 {
                     suffixValue = idCard;
                 }
             }
-            return prefixValue + "." + suffixValue;
+            return prefixValue + suffixValue;
+            //return prefixValue + "." + suffixValue;
         }
 
         /// <summary>