1

REBORN.CacheManager/User/RBUserCache.cs

@@ -159,7 +159,8 @@ namespace REBORN.CacheManager.User
                         B2BDomain = b2bDomain,
                         Domain = domain,
                         IsExactness = true,//ValidateHepler.IsPwd(EmPassword),
-                        SimpleEasy= gmodel.SimpleEasy,
+                        SimpleEasy = gmodel.SimpleEasy,
+                        IsGroupShow = model.IsGroupShow
                     };
                     try
                     {

REBORN.Common/API/UserInfo.cs

@@ -251,5 +251,9 @@ namespace REBORN.Common
         /// 0-不是，1-是（简易版报名流程）
         /// </summary>
         public int SimpleEasy { get; set; }
+        /// <summary>
+        /// 账号集团共享
+        /// </summary>
+        public int IsGroupShow { get; set; }
     }
 }

REBORN.Services.PlatformService/BranchService.cs

@@ -58,6 +58,10 @@ namespace REBORN.Services.PlatformService
             {
                 demodel.RB_Group_Id = 2;
             }
+            if (userInfo.SimpleEasy == 1 && userInfo.IsGroupShow != 1)
+            {
+                demodel.BranchIdStr = userInfo.RB_Branch_id.ToString();
+            }
             var list = branchmodule.GetList(demodel);
             if (!string.IsNullOrWhiteSpace(request.uid) && request.requestFrom == Common.Enum.ApiRequestFromEnum.ERP)
             {

REBORN.Services.UserService/LoginService.cs

@@ -273,6 +273,7 @@ namespace REBORN.Services.UserService
                     IsExactness = IsExactness,
                     IsEditTripTemplate = IsEditTripTemplate,
                     SimpleEasy= gmodel.SimpleEasy,
+                    IsGroupShow = model.IsGroupShow
                 };
                 redisHelper.StringSet<UserInfo>(UserModuleCacheKeyConfig.USER_Login_Info + model.EmployeeId, obj, Config.JwtExpirTime);
                 redisHelper.Set(UserModuleCacheKeyConfig.USER_SysMenu_StrInfo + model.EmployeeId, userSysMenuStr, Config.JwtExpirTime);