1

REBORN.Module.SellModule/AllianceModule.cs

@@ -458,7 +458,7 @@ namespace REBORN.Module.SellModule
                         RB_Finance_Infochange_Log financeLog = new Model.Entity.Log.RB_Finance_Infochange_Log();
                         #region 添加银行机构
                         var tempFlag = true;
-                        var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName)?.FirstOrDefault();
+                        var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName, userInfo.RB_Group_id)?.FirstOrDefault();
                         if (FinancialInstitutions == null)
                         {
                             FinancialInstitutions = new RB_FinancialInstitutions_Extend()
@@ -684,7 +684,7 @@ namespace REBORN.Module.SellModule
                         RB_Finance_Infochange_Log financeLog = new Model.Entity.Log.RB_Finance_Infochange_Log();
                         #region 添加银行机构
                         var tempFlag = true;
-                        var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName)?.FirstOrDefault();
+                        var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName, userInfo.RB_Group_id)?.FirstOrDefault();
                         if (FinancialInstitutions == null)
                         {
                             FinancialInstitutions = new RB_FinancialInstitutions_Extend()
@@ -1381,7 +1381,7 @@ namespace REBORN.Module.SellModule
                     RB_FinancialInstitutions_Extend rB_Financial = new RB_FinancialInstitutions_Extend();
                     RB_Finance_Infochange_Log financeLog = new Model.Entity.Log.RB_Finance_Infochange_Log();
                     #region 添加银行机构
-                    var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName)?.FirstOrDefault();
+                    var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName, userInfo.RB_Group_id)?.FirstOrDefault();
                     if (FinancialInstitutions == null)
                     {
                         FinancialInstitutions = new RB_FinancialInstitutions_Extend()

REBORN.Module.UserModule/EmployeeModule.cs

@@ -1154,7 +1154,7 @@ namespace REBORN.Module.UserModule
             }
             RB_FinancialInstitutions_Extend rB_Financial = new RB_FinancialInstitutions_Extend();
             #region 添加银行机构
-            var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName)?.FirstOrDefault();
+            var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName, dmodel.RB_Group_Id ?? 0)?.FirstOrDefault();
             if (FinancialInstitutions == null)
             {
                 FinancialInstitutions = new RB_FinancialInstitutions_Extend()

REBORN.Repository/Finance/RB_FinancialInstitutionsRepository.cs

@@ -173,9 +173,12 @@ left join rb_accountrelation al on t.BankType=al.AccountType and t.ID=al.Account
         /// </summary>
         /// <param name="Name"></param>
         /// <returns></returns>
-        public List<RB_FinancialInstitutions_Extend> GetByNameList(string Name)
+        public List<RB_FinancialInstitutions_Extend> GetByNameList(string Name, int GroupId =0)
         {
             string where = string.Format(" where  " + nameof(RB_FinancialInstitutions.Status) + "={0}", (int)Common.Enum.DateStateEnum.Normal);
+            if (GroupId > 0) {
+                where += string.Format(" AND " + nameof(RB_FinancialInstitutions.GroupId) + "={0}", GroupId);
+            }
             if (!string.IsNullOrWhiteSpace(Name))
             {
                 where += string.Format(" AND " + nameof(RB_FinancialInstitutions.Name) + "='{0}'", Name);