1

REBORN.Model/Extend/Finance/RB_Finance_Remittance_Claim_Extend.cs

@@ -91,6 +91,11 @@ namespace REBORN.Model.Extend.Finance
         /// 财务单据ID
         /// </summary>
         public int FinanceId { get; set; }
+
+        /// <summary>
+        /// 公司
+        /// </summary>
+        public int BranchId { get; set; }
     }
 
     /// <summary>

REBORN.Repository/Finance/RB_Finance_Remittance_ClaimRepository.cs

@@ -177,10 +177,18 @@ left join rb_backaccount b on c.BankAccountId=b.ID
                     where += string.Format(" AND (c.Income+c.Refund)>c.ClaimMoney");
                 }
             }
+            if (model.BranchId > 0)
+            {
+                //控制公司查询
+                where += string.Format(" AND ar.RB_Branch_Id ={0}", model.BranchId);
+            }
+
             return GetPage<RB_Finance_Remittance_Claim_Extend>(pageIndex,pageSize,out count,$@"
-select c.*,case when c.BankType=1 then b.alias else p.Alias end as Alias,case when c.BankType=1 then b.accountholder else p.Accountholder end as AccountName,case when c.BankType=1 then b.openingbank else '-' end as openingbank,case when c.BankType=1 then b.backNo else p.PlatformNo end as backNo from RB_Finance_Remittance_Claim c
+select c.*,case when c.BankType=1 then b.alias else p.Alias end as Alias,case when c.BankType=1 then b.accountholder else p.Accountholder end as AccountName,case when c.BankType=1 then b.openingbank else '-' end as openingbank,case when c.BankType=1 then b.backNo else p.PlatformNo end as backNo 
+from RB_Finance_Remittance_Claim c
 left join rb_backaccount b on c.BankAccountId=b.ID and c.BankType=1
 left join rb_platformaccount p on c.BankAccountId=p.ID and c.BankType=2
+{(model.BranchId > 0? "left join rb_accountrelation ar on ar.AccountType=1 and b.ID =ar.AccountID and ar.Type =2 and ar.`Status`=0" : "")}
 {where} {(pageSize==9999? "order by c.TradeDate desc" : "order by c.ID desc")} ").ToList();
         }
 
@@ -238,8 +246,15 @@ left join rb_platformaccount p on c.BankAccountId=p.ID and c.BankType=2
             {
                 where += string.Format(" AND (c.Income+c.Refund)>c.ClaimMoney");
             }
+            if (model.BranchId > 0)
+            {
+                //控制公司查询
+                where += string.Format(" AND ar.RB_Branch_Id ={0}", model.BranchId);
+            }
+
             return Get<RB_Finance_Remittance_Claim_Extend>($@"
 SELECT c.Id,c.Income,c.Refund,c.ClaimMoney FROM rb_finance_remittance_claim c
+{(model.BranchId > 0 ? "left join rb_accountrelation ar on ar.AccountType=1 and c.BankAccountId =ar.AccountID and ar.Type =2 and ar.`Status`=0" : "")}
 {where}").ToList();
         }
 

REBORN.Services.FinanceService/FinancialService.cs

@@ -9414,6 +9414,11 @@ namespace REBORN.Services.FinanceService
             RB_Finance_Remittance_Claim_Extend model = JsonHelper.DeserializeObject<RB_Finance_Remittance_Claim_Extend>(request.msg.ToString());
             UserInfo userInfo = request.groupId > 0 && request.requestFrom == Common.Enum.ApiRequestFromEnum.Edu ? CacheManager.User.RbUserCache.GetUserInfoForEdu(request) : CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
             model.RB_Group_Id = userInfo.RB_Group_id;
+            userInfo.ActionMenuCode = module.GetActionCode(userInfo.RB_Post_Id);
+            //F_Query_AllIncomPay-查看所有
+            if (("," + userInfo.ActionMenuCode + ",").Contains(",F_Query_AllIncomPay,") || ("," + userInfo.ActionMenuCode + ",").Contains(",F_Cashier,")) { }
+            else { model.BranchId = userInfo.RB_Branch_id; }
+                
             var list = module.GetFinanceRemittanceClaimPageList(pmodel.pageIndex, pmodel.pageSize, model, userInfo, out long count);
             pmodel.count = int.Parse(count.ToString());
             pmodel.pageData = list.Select(x => new
@@ -9500,6 +9505,10 @@ namespace REBORN.Services.FinanceService
             RB_Finance_Remittance_Claim_Extend model = JsonHelper.DeserializeObject<RB_Finance_Remittance_Claim_Extend>(request.msg.ToString());
             UserInfo userInfo = request.groupId > 0 && request.requestFrom == Common.Enum.ApiRequestFromEnum.Edu ? CacheManager.User.RbUserCache.GetUserInfoForEdu(request) : CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
             model.RB_Group_Id = userInfo.RB_Group_id;
+            userInfo.ActionMenuCode = module.GetActionCode(userInfo.RB_Post_Id);
+            //F_Query_AllIncomPay-查看所有
+            if (("," + userInfo.ActionMenuCode + ",").Contains(",F_Query_AllIncomPay,") || ("," + userInfo.ActionMenuCode + ",").Contains(",F_Cashier,")) { }
+            else { model.BranchId = userInfo.RB_Branch_id; }
             var Robj = module.GetFinanceRemittanceClaimStatistics(model);
             return ApiResult.Success("", Robj);
         }