1、单位数据清理合并功能;
2、单位新增编辑功能调整,补充英文名称等; 3、建筑企业单位资质字典;
This commit is contained in:
@@ -32,7 +32,7 @@ namespace FineUIPro.Web.SysManage
|
||||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @"SELECT Unit.UnitId,Unit.UnitCode,Unit.UnitName,Unit.ProjectRange,Unit.Corporate,Unit.Address,Unit.Telephone,Unit.Fax,Unit.EMail,UnitType.UnitTypeId,UnitType.UnitTypeCode,UnitType.UnitTypeName,Unit.IsBranch,supUnit.UnitName AS supUnitName"
|
||||
string strSql = @"SELECT Unit.UnitId,Unit.UnitCode,Unit.UnitName,Unit.UnitEnName,Unit.ShortUnitName,Unit.CollCropCode,Unit.ProjectRange,Unit.Corporate,Unit.Address,Unit.Telephone,Unit.Fax,Unit.EMail,UnitType.UnitTypeId,UnitType.UnitTypeCode,UnitType.UnitTypeName,Unit.IsBranch,supUnit.UnitName AS supUnitName"
|
||||
+ @" From dbo.Base_Unit AS Unit "
|
||||
+ @" LEFT JOIN Base_UnitType AS UnitType ON UnitType.UnitTypeId=Unit.UnitTypeId"
|
||||
+ @" LEFT JOIN Base_Unit AS supUnit ON Unit.SupUnitId=supUnit.UnitId"
|
||||
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.SysManage
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
if (!string.IsNullOrEmpty(this.txtUnitName.Text.Trim()))
|
||||
{
|
||||
strSql += " AND Unit.UnitName LIKE @UnitName";
|
||||
strSql += " AND (Unit.UnitCode LIKE @UnitName or Unit.UnitName LIKE @UnitName or Unit.UnitEnName LIKE @UnitName or Unit.ShortUnitName LIKE @UnitName)";
|
||||
listStr.Add(new SqlParameter("@UnitName", "%" + this.txtUnitName.Text.Trim() + "%"));
|
||||
}
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
@@ -93,10 +93,10 @@ namespace FineUIPro.Web.SysManage
|
||||
}
|
||||
}
|
||||
|
||||
//if (this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.fuweiId || this.CurrUser.UserId == Const.shenyinhangId)
|
||||
//{//系统管理员、合肥诺必达、付伟、申银行
|
||||
this.btnDataBase.Hidden = false;
|
||||
//}
|
||||
if (this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.fuweiId || this.CurrUser.UserId == Const.shenyinhangId)
|
||||
{//系统管理员、合肥诺必达、付伟、申银行
|
||||
this.btnDataBase.Hidden = false;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
Reference in New Issue
Block a user