From 76c772ffb1355d790f3a36d76f8ade06fe25fc5a Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期三, 09 十月 2024 15:13:42 +0800 Subject: [PATCH] 修复了一些已知问题 --- Tiger.IBusiness/Extensions/DbExtension.cs | 210 +++++++++++++++++++++++++++++----------------------- 1 files changed, 116 insertions(+), 94 deletions(-) diff --git a/Tiger.IBusiness/Extensions/DbExtension.cs b/Tiger.IBusiness/Extensions/DbExtension.cs index 425aec4..74255b5 100644 --- a/Tiger.IBusiness/Extensions/DbExtension.cs +++ b/Tiger.IBusiness/Extensions/DbExtension.cs @@ -29,17 +29,17 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; @@ -59,25 +59,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <typeparam name="T2"></typeparam> @@ -90,24 +91,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <typeparam name="T2"></typeparam> @@ -120,25 +122,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -150,24 +153,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -179,25 +183,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -209,24 +214,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -238,25 +244,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -268,24 +275,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -297,25 +305,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -327,24 +336,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -356,25 +366,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -386,24 +397,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -415,25 +427,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -445,24 +458,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -474,25 +488,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -504,24 +519,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -533,25 +549,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -563,24 +580,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -592,25 +610,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -622,24 +641,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -651,25 +671,26 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -681,24 +702,25 @@ //缁勭粐鏈烘瀯鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Org) && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(o => o.USER_ID == userId && o.ORG_CODE == q.AUTH_ORG).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_ORG>().Where(authorization => authorization.USER_ID == userId && authorization.ORG_CODE == q.AUTH_ORG).Any()); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Prod) && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(o => o.USER_ID == userId && o.PROD_CODE == q.AUTH_PROD).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_PROD>().Where(authorization => authorization.USER_ID == userId && authorization.PROD_CODE == q.AUTH_PROD).Any()); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (options.HasFlag(DbAuth.Wh) && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { - queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(o => o.USER_ID == userId && o.WH_CODE == q.AUTH_WH).Any()); + queryable = queryable.Where(q => SqlFunc.Subqueryable<V_USER_WH>().Where(authorization => authorization.USER_ID == userId && authorization.WH_CODE == q.AUTH_WH).Any()); } return queryable; } /// <summary> - /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁 + /// 閫氳繃鎺堟潈鏌ヨ鏁版嵁<br/> + /// 娉ㄦ剰锛氳仈琛ㄦ巿鏉冩煡璇㈡椂锛屼富琛ㄧ殑鍒悕蹇呴』涓簈锛屼笉鐒朵細鍑洪敊 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="queryable"></param> @@ -710,19 +732,19 @@ if (!options.OrgCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_ORG").IsNullOrEmpty()) { var orgList = options.OrgCode.Split(",", StringSplitOptions.RemoveEmptyEntries); - queryable = queryable.Where(q => orgList.Any(o => o == q.AUTH_ORG)); + queryable = queryable.Where(q => orgList.Any(authorization => authorization == q.AUTH_ORG)); } //鐢熶骇鍗曞厓鎺堟潈楠岃瘉 if (!options.ProdCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_PROD").IsNullOrEmpty()) { var prodList = options.ProdCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => prodList.Any(o => o == q.AUTH_PROD)); + queryable = queryable.Where(q => prodList.Any(authorization => authorization == q.AUTH_PROD)); } //浠撳簱鍗曞厓鎺堟潈楠岃瘉 if (!options.WhCode.IsNullOrEmpty() && !typeof(T).GetProperty("AUTH_WH").IsNullOrEmpty()) { var whList = options.WhCode.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList(); - queryable = queryable.Where(q => whList.Any(o => o == q.AUTH_WH)); + queryable = queryable.Where(q => whList.Any(authorization => authorization == q.AUTH_WH)); } return queryable.ByAuth(options.UserId, options.GetOptions()); } -- Gitblit v1.9.3