Skip to content

H
huatu_API
Commit 93e472a4 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 95fcae9d
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 7 deletions
REBORN.Services.CommissionService/MergeCommissionService.cs
View file @ 93e472a4
...@@ -185,7 +185,8 @@ namespace REBORN.Services.CommissionService ...@@ -185,7 +185,8 @@ namespace REBORN.Services.CommissionService
RB_B2BSale_Commission_Periods_Extend demodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Periods_Extend>(request.msg.ToString()); RB_B2BSale_Commission_Periods_Extend demodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Periods_Extend>(request.msg.ToString());
demodel.RB_Group_Id = userInfo.RB_Group_id; demodel.RB_Group_Id = userInfo.RB_Group_id;
#region 权限 #region 权限
string actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id); string actionMenu = userInfo.ActionMenuCode;
if (string.IsNullOrEmpty(actionMenu)) { actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id); }
if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("F_Commission_Branch")) if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("F_Commission_Branch"))
{ {
demodel.IsFBranch = userInfo.RB_Branch_id; demodel.IsFBranch = userInfo.RB_Branch_id;
...@@ -251,7 +252,8 @@ namespace REBORN.Services.CommissionService ...@@ -251,7 +252,8 @@ namespace REBORN.Services.CommissionService
RB_B2BSale_Commission_Emp_Extend demodel = JsonConvert.DeserializeObject<RB_B2BSale_Commission_Emp_Extend>(request.msg.ToString()); RB_B2BSale_Commission_Emp_Extend demodel = JsonConvert.DeserializeObject<RB_B2BSale_Commission_Emp_Extend>(request.msg.ToString());
demodel.RB_Group_Id = userInfo.RB_Group_id; demodel.RB_Group_Id = userInfo.RB_Group_id;
#region 权限 #region 权限
string actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id); string actionMenu = userInfo.ActionMenuCode;
if (string.IsNullOrEmpty(actionMenu)) { actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id); }
if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("F_Commission_Branch")) if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("F_Commission_Branch"))
{ {
demodel.Q_MyBranch = userInfo.RB_Branch_id; demodel.Q_MyBranch = userInfo.RB_Branch_id;
...@@ -308,7 +310,8 @@ namespace REBORN.Services.CommissionService ...@@ -308,7 +310,8 @@ namespace REBORN.Services.CommissionService
RB_B2BSale_Commission_Details_Extend demodel = JsonConvert.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(request.msg.ToString()); RB_B2BSale_Commission_Details_Extend demodel = JsonConvert.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(request.msg.ToString());
demodel.RB_Group_Id = userInfo.RB_Group_id; demodel.RB_Group_Id = userInfo.RB_Group_id;
#region 权限 #region 权限
string actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id); string actionMenu = userInfo.ActionMenuCode;
if (string.IsNullOrEmpty(actionMenu)) { actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id); }
if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("F_Commission_Branch")) if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("F_Commission_Branch"))
{ {
demodel.Q_MyBranch = userInfo.RB_Branch_id; demodel.Q_MyBranch = userInfo.RB_Branch_id;
...@@ -440,7 +443,8 @@ namespace REBORN.Services.CommissionService ...@@ -440,7 +443,8 @@ namespace REBORN.Services.CommissionService
demodel.RB_Group_Id = userInfo.RB_Group_id; demodel.RB_Group_Id = userInfo.RB_Group_id;
#region 权限 #region 权限
string actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id); string actionMenu = userInfo.ActionMenuCode;
if (string.IsNullOrEmpty(actionMenu)) { actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id); }
if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("F_Commission_Branch")) if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("F_Commission_Branch"))
{ {
demodel.Q_MyBranch = userInfo.RB_Branch_id; demodel.Q_MyBranch = userInfo.RB_Branch_id;
...@@ -2579,7 +2583,8 @@ namespace REBORN.Services.CommissionService ...@@ -2579,7 +2583,8 @@ namespace REBORN.Services.CommissionService
} }
if (userInfo != null && userInfo.RB_Post_Id > 0) if (userInfo != null && userInfo.RB_Post_Id > 0)
{ {
string actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id); string actionMenu = userInfo.ActionMenuCode;
if (string.IsNullOrEmpty(actionMenu)) { actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id); }
if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("F_UpdateManagerRate"))//可以修改负责人提成 if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("F_UpdateManagerRate"))//可以修改负责人提成
{ {
demodel.IsMoneyFinish = 1; demodel.IsMoneyFinish = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment