diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 162b4883..18a6a139 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -12279,7 +12279,7 @@ True 0 / - http://localhost:9691/ + http://localhost:4909/ False False diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManageEdit.aspx.cs index 33733fe7..fb0038e5 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManageEdit.aspx.cs @@ -57,7 +57,7 @@ namespace FineUIPro.Web.HJGL.PersonManage string PersonId = Request.Params["PersonId"]; if (!string.IsNullOrEmpty(PersonId)) { - var welder = BLL.SitePerson_PersonService.GetSitePersonById(PersonId); + var welder = BLL.SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, PersonId); if (welder != null) { this.txtWelderCode.Text = welder.WelderCode; diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx b/SGGL/FineUIPro.Web/SysManage/UserList.aspx index 1eeb3140..101e1d17 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx +++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx @@ -119,11 +119,11 @@ diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs index 7867b1a0..bfea6357 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs @@ -42,7 +42,8 @@ From Person_Persons AS person LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=person.UnitId LEFT JOIN Base_Depart AS Depart ON Depart.DepartId=person.DepartId - WHERE RoleIds IS NOT NULL AND person.PersonId !='" + Const.sysglyId + "' AND person.PersonId !='" + Const.hfnbdId + "' AND person.PersonId !='" + Const.sedinId + "'"; + WHERE RoleIds IS NOT NULL AND RoleIds != '' AND Account IS NOT NULL AND Account !='' + AND person.PersonId !='" + Const.sysglyId + "' AND person.PersonId !='" + Const.hfnbdId + "' AND person.PersonId !='" + Const.sedinId + "'"; List listStr = new List(); //if (rbUnit.SelectedValue == "0") //{