lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
李鹏飞 2022-12-14 11:38:37 +08:00
parent 8edb9a4bb9 776fbbda68
commit 1ecf0efb22
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -12279,7 +12279,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>

2
SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManageEdit.aspx.cs
View File

@ -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;

4
SGGL/FineUIPro.Web/SysManage/UserList.aspx
View File

@ -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">

3
SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs
View File

@ -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")
//{