Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New
This commit is contained in:
@@ -441,7 +441,7 @@ namespace BLL
|
||||
&& (strWorkPostId == null || x.WorkPostId == strWorkPostId)
|
||||
&& x.States == states
|
||||
select x;
|
||||
if (unitId != Const.UnitId_SEDIN && !string.IsNullOrEmpty(unitId))
|
||||
if (unitId != Const.UnitId_SEDIN && unitId != Const.UnitId_SEDINNB && !string.IsNullOrEmpty(unitId))
|
||||
{
|
||||
getViews = getViews.Where(x => x.UnitId == unitId);
|
||||
}
|
||||
|
||||
@@ -375,6 +375,11 @@ namespace BLL
|
||||
/// </summary>
|
||||
public static string WorkPost_Welder = "19B8F2A9-28D3-4F20-867A-1B2237C2E228";
|
||||
|
||||
/// <summary>
|
||||
/// 焊工岗位Id
|
||||
/// </summary>
|
||||
public static string WorkPost_Welder2 = "2121c01d-b0ef-487c-ac26-1b18109daf05";
|
||||
|
||||
/// <summary>
|
||||
/// 无损检测工岗位Id
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user