diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgController.java
index 2f82ee8..29a834a 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgController.java
@@ -74,6 +74,22 @@ public class OrgController {
         return success(BeanUtils.toBean(org, OrgRespVO.class));
     }
 
+    @GetMapping("/get-by-orgid")
+    @Operation(summary = "根据机构ID查询机构详情")
+    @Parameter(name = "orgid", description = "机构ID", required = true, example = "1024")
+    public CommonResult<OrgRespVO> getOrgByOrgId(@RequestParam("orgid") Integer orgid) {
+        OrgDO org = orgService.getOrgByOrgId(orgid);
+        return success(BeanUtils.toBean(org, OrgRespVO.class));
+    }
+
+    @GetMapping("/get-by-parent-orgid")
+    @Operation(summary = "根据父机构ID查询子机构列表")
+    @Parameter(name = "parentOrgId", description = "父机构ID", required = true, example = "1001")
+    public CommonResult<List<OrgRespVO>> getOrgByParentOrgId(@RequestParam("parentOrgId") Integer parentOrgId) {
+        List<OrgDO> list = orgService.getOrgListByParentOrgId(parentOrgId);
+        return success(BeanUtils.toBean(list, OrgRespVO.class));
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得机构分页")
     public CommonResult<PageResult<OrgRespVO>> getOrgPage(@Valid OrgPageReqVO pageReqVO) {
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java
index 4562b36..ccc8ae5 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java
@@ -36,7 +36,10 @@ public class UserPageReqVO extends PageParam {
     private Long deptId;
 
     @Schema(description = "机构ID", example = "1")
-    private Integer orgId;
+    private Integer orgid;
+
+    @Schema(description = "机构名称", example = "艾康菲")
+    private Integer orgname;
 
     @Schema(description = "角色编号", example = "1024")
     private Long roleId;
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java
index b5790c1..d02b164 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java
@@ -33,11 +33,11 @@ public class UserRespVO{
 
     @Schema(description = "机构ID", example = "1001")
     @ExcelProperty("机构ID")
-    private Integer orgId;
+    private Integer orgid;
 
     @Schema(description = "机构名称", example = "艾康菲")
     @ExcelProperty("机构名称")
-    private String orgName;
+    private String orgname;
 
     @Schema(description = "部门ID", example = "我是一个用户")
     private Long deptId;
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
index d8ed9c9..8f324e1 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
@@ -39,11 +39,11 @@ public class UserSaveReqVO {
 
     @Schema(description = "机构ID", example = "1001")
     @DiffLogField(name = "机构ID")
-    private Integer orgId;
+    private Integer orgid;
 
     @Schema(description = "机构名称", example = "艾康菲")
     @DiffLogField(name = "机构名称")
-    private String orgName;
+    private String orgname;
 
     @Schema(description = "部门编号", example = "我是一个用户")
     @DiffLogField(name = "部门", function = DeptParseFunction.NAME)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java
index 9483566..41d7f24 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java
@@ -18,10 +18,10 @@ public class UserSimpleRespVO {
     private String nickname;
 
     @Schema(description = "机构ID", example = "1001")
-    private Integer orgId;
+    private Integer orgid;
 
     @Schema(description = "机构名称", example = "艾康菲")
-    private String orgName;
+    private String orgname;
 
     @Schema(description = "部门ID", example = "我是一个用户")
     private Long deptId;
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java
index 803413c..d0cd837 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java
@@ -50,13 +50,11 @@ public class AdminUserDO extends TenantBaseDO {
     /**
      * 机构id
      */
-    @TableField("orgid")
-    private Integer orgId;
+    private Integer orgid;
     /**
      * 机构名称
      */
-    @TableField("orgname")
-    private String orgName;
+    private String orgname;
     /**
      * 备注
      */
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgMapper.java
index 6238501..9b0e1d1 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgMapper.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgMapper.java
@@ -51,4 +51,14 @@ public interface OrgMapper extends BaseMapperX<OrgDO> {
                 .orderByDesc(OrgDO::getId));
     }
 
+    /**
+     * 根据父机构ID查询子机构列表
+     * @param parentOrgId 父机构ID
+     * @return 子机构列表
+     */
+    default List<OrgDO> selectListByParentOrgId(Integer parentOrgId) {
+        return selectList(new LambdaQueryWrapperX<OrgDO>()
+                .eq(OrgDO::getParentOrgId, parentOrgId)
+                .orderByDesc(OrgDO::getId));
+    }
 }
\ No newline at end of file
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java
index 57798d2..20e4469 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java
@@ -30,7 +30,8 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
                 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
-                .eqIfPresent(AdminUserDO::getOrgId, reqVO.getOrgId())
+                .eqIfPresent(AdminUserDO::getOrgid, reqVO.getOrgid())
+                .eqIfPresent(AdminUserDO::getOrgname, reqVO.getOrgname())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
                 .inIfPresent(AdminUserDO::getId, userIds)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgService.java
index 4455dcd..470b79c 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgService.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgService.java
@@ -51,6 +51,13 @@ public interface OrgService {
      */
     OrgDO getOrg(Integer id);
 
+    /**
+     * 根据机构ID查询机构
+     * @param orgId 机构ID
+     * @return 机构
+     */
+    OrgDO getOrgByOrgId(Integer orgId);
+
     /**
      * 获得机构分页
      *
@@ -73,4 +80,10 @@ public interface OrgService {
      */
     List<OrgDO> getOrgList();
 
+    /**
+     * 根据父机构ID查询子机构列表
+     * @param parentOrgId 父机构ID
+     * @return 子机构列表
+     */
+    List<OrgDO> getOrgListByParentOrgId(Integer parentOrgId);
 }
\ No newline at end of file
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgServiceImpl.java
index c0c3529..20ab7cc 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgServiceImpl.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/org/OrgServiceImpl.java
@@ -103,6 +103,11 @@ public class OrgServiceImpl implements OrgService {
         return orgMapper.selectById(id);
     }
 
+    @Override
+    public OrgDO getOrgByOrgId(Integer orgId) {
+        return orgMapper.selectByOrgId(orgId);
+    }
+
     @Override
     public PageResult<OrgDO> getOrgPage(OrgPageReqVO pageReqVO) {
         return orgMapper.selectPage(pageReqVO);
@@ -118,4 +123,8 @@ public class OrgServiceImpl implements OrgService {
         return orgMapper.selectList();
     }
 
+    @Override
+    public List<OrgDO> getOrgListByParentOrgId(Integer parentOrgId) {
+        return orgMapper.selectListByParentOrgId(parentOrgId);
+    }
 }
\ No newline at end of file