From dbd41568b525e9102d9c14930d74e49af1d699f6 Mon Sep 17 00:00:00 2001
From: yhw0507 <yhw0508@163.com>
Date: Mon, 12 Dec 2022 14:44:11 +0800
Subject: [PATCH 1/2] 20221212

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       | 2 +-
 SGGL/FineUIPro.Web/SysManage/UserList.aspx    | 4 ++--
 SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index d2fdfd74..c2f545a2 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -12255,7 +12255,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:9691/</IISUrl>
+          <IISUrl>http://localhost:4909/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
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 @@
             </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="用户信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" Maximized="true"
             Height="650px">
         </f:Window>
         <f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="false" 
             CloseAction="HidePostBack" Width="1000px" Height="560px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
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<SqlParameter> listStr = new List<SqlParameter>();
             //if (rbUnit.SelectedValue == "0")
             //{

From 776fbbda68de6593ec6d3002250d94d95e60a03e Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Tue, 13 Dec 2022 17:28:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=84=8A=E5=B7=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9=E7=84=8A?=
 =?UTF-8?q?=E5=B7=A5=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManageEdit.aspx.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;