From 7092e696d98d0593a0d66efb1066daefe16d685b Mon Sep 17 00:00:00 2001
From: chenbowen <you@example.com>
Date: Fri, 29 Aug 2025 09:21:14 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4=20e=20=E5=8A=9E=20schem?=
 =?UTF-8?q?e=20=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 0215d22c931fccdf4e5e06e997a0bac8d55ff641)
---
 .../admin/sync/vo/org/OrgUpdateRequestVO.java      |  2 --
 .../system/service/sync/SchemaSyncServiceImpl.java | 14 +++++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgUpdateRequestVO.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgUpdateRequestVO.java
index d108cc02..1031b9eb 100644
--- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgUpdateRequestVO.java
+++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgUpdateRequestVO.java
@@ -32,6 +32,4 @@ public class OrgUpdateRequestVO extends DeptDO {
     private Integer status;
     @Schema(description = "机构类型", required = true, example = "28=单位、26=部门")
     private Integer deptType;
-    @Schema(description = "机构 是否集团")
-    private Boolean isGroup;
 }
diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/sync/SchemaSyncServiceImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/sync/SchemaSyncServiceImpl.java
index 62bf2583..e9883e41 100644
--- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/sync/SchemaSyncServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/sync/SchemaSyncServiceImpl.java
@@ -1,10 +1,10 @@
 package cn.iocoder.yudao.module.system.service.sync;
 
+import cn.iocoder.yudao.module.system.controller.admin.sync.vo.org.OrgUpdateRequestVO;
 import cn.iocoder.yudao.module.system.controller.admin.sync.vo.schema.SchemaAttributeVO;
 import cn.iocoder.yudao.module.system.controller.admin.sync.vo.schema.SchemaRequestVO;
 import cn.iocoder.yudao.module.system.controller.admin.sync.vo.schema.SchemaResponseVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.controller.admin.sync.vo.user.UserUpdateRequestVO;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import org.springframework.stereotype.Service;
@@ -23,8 +23,8 @@ public class SchemaSyncServiceImpl implements SchemaSyncService {
     public SchemaResponseVO getSchema(SchemaRequestVO requestVO) {
         SchemaResponseVO resp = new SchemaResponseVO();
         resp.setBimRequestId(requestVO.getBimRequestId());
-        resp.setAccount(buildSchemaAttributes(AdminUserDO.class));
-        resp.setOrganization(buildSchemaAttributes(DeptDO.class));
+        resp.setAccount(buildSchemaAttributes(UserUpdateRequestVO.class));
+        resp.setOrganization(buildSchemaAttributes(OrgUpdateRequestVO.class));
         return resp;
     }
 
@@ -36,7 +36,11 @@ public class SchemaSyncServiceImpl implements SchemaSyncService {
         // 使用 Spring ReflectionUtils 遍历字段
         // 遍历类及其父类字段，过滤静态、常量、以及不返回的字段
         // 优化排除逻辑：支持批量、可扩展、忽略大小写和前缀
-        final String[] excludeFields = {"companyDeptInfos", "postIds", "tenantId", "createTime", "updateTime", "creator", "updater", "companyIds", "avatar"};
+        final String[] excludeFields = {"companyDeptInfos", "postIds", "tenantId", "createTime", "updateTime", "creator", "updater", "deleted",
+                "companyIds", "avatar",
+                "isCompany", "isGroup",
+                "bimRemoteUser", "bimRemotePwd", "bimRequestId", "bimUid", "bimOrgId",
+        };
         final String[] excludePrefixes = {"internal", "_"};
         ReflectionUtils.doWithFields(clazz, field -> {
             field.setAccessible(true);