Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS
This commit is contained in:
commit
7e5b554563
|
@ -11,7 +11,7 @@
|
|||
<FineUIPro DebugMode="false" Theme="Cupertino"/>
|
||||
<appSettings>
|
||||
<!--连接字符串-->
|
||||
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
|
||||
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
|
||||
<!--系统名称-->
|
||||
<add key="SystemName" value="诺必达焊接管理系统"/>
|
||||
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
|
||||
|
|
|
@ -248,7 +248,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
|
|||
Alert.ShowInTop("请选择使用位置!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
if (this.drpUsingUnit.SelectedValue == BLL.Const._Null)
|
||||
if (this.drpUsingUnit.SelectedValue == BLL.Const._Null && this.CurrUser.UserId != BLL.Const.GlyId)
|
||||
{
|
||||
Alert.ShowInTop("请选择使用单位!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
|
|
Loading…
Reference in New Issue