禅道#934修复

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java

@@ -108,8 +108,9 @@ public interface OrganService {
      * 其中，组织编号从 {@link OrganContextHolder} 上下文中获取
      *
      * @param handler 处理器
+     * @param organId 外部传入组织id，满足超管切换组织操作
      */
-    void handleOrganInfo(OrganInfoHandler handler);
+    void handleOrganInfo(OrganInfoHandler handler, Long organId);
 
     /**
      * 进行组织的菜单处理逻辑

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java

@@ -402,13 +402,13 @@ public class OrganServiceImpl implements OrganService {
     }
 
     @Override
-    public void handleOrganInfo(OrganInfoHandler handler) {
+    public void handleOrganInfo(OrganInfoHandler handler,Long organId) {
         // 如果禁用，则不执行逻辑
         if (isTenantDisable()) {
             return;
         }
         // 获得组织
-        OrganizationDO tenant = getOrgan(OrganContextHolder.getRequiredOrganId());
+        OrganizationDO tenant = getOrgan(ObjectUtil.isNotNull(organId) ? organId : OrganContextHolder.getRequiredOrganId());
         // 执行处理器
         handler.handle(tenant);
     }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java

@@ -139,7 +139,7 @@ public class AdminUserServiceImpl implements AdminUserService {
             if (count >= organ.getAccountCount()) {
                 throw ServiceExceptionUtil.exception(ErrorCodeConstants.USER_COUNT_MAX, organ.getAccountCount());
             }
-        });
+        }, organId);
 
         // 校验正确性
         validateUserForCreateOrUpdate(null, createReqVO.getMobile(),