From 07bc994eba3bbdd5bf3ec60cd21bf7ad7a0a2087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sun, 19 Jul 2026 00:12:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor(database):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=8F=8AMapper=E4=B8=AD=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E4=B8=BAgxwebsoft=5Fcore=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改所有实体类@TableName注解的表名，添加gxwebsoft_core数据库前缀 - 更新各XML Mapper中的SQL语句表名，统一加上gxwebsoft_core前缀 - 调整关联查询和多个子查询中的表名对应关系，确保与实体类一致 - 涉及实体类包括Company、CompanyComment、Dict、User等多个核心业务表 - 保持代码逻辑和功能不变，确保数据库访问路径更新规范化 --- .workbuddy/memory/2026-07-18.md | 38 ++++++ docs/check_gxwebsoft_core_sys_tables.sql | 124 ++++++++++++++++++ .../common/system/entity/Company.java | 2 +- .../common/system/entity/CompanyComment.java | 2 +- .../common/system/entity/CompanyContent.java | 2 +- .../common/system/entity/CompanyGit.java | 4 +- .../system/entity/CompanyParameter.java | 2 +- .../common/system/entity/CompanyUrl.java | 2 +- .../gxwebsoft/common/system/entity/Dict.java | 2 +- .../common/system/entity/DictData.java | 2 +- .../common/system/entity/Dictionary.java | 2 +- .../common/system/entity/DictionaryData.java | 2 +- .../common/system/entity/Domain.java | 2 +- .../common/system/entity/EmailRecord.java | 2 +- .../common/system/entity/FileRecord.java | 2 +- .../common/system/entity/LoginRecord.java | 2 +- .../gxwebsoft/common/system/entity/Menu.java | 2 +- .../common/system/entity/Organization.java | 2 +- .../common/system/entity/Payment.java | 2 +- .../gxwebsoft/common/system/entity/Plug.java | 2 +- .../gxwebsoft/common/system/entity/Role.java | 2 +- .../common/system/entity/RoleMenu.java | 2 +- .../common/system/entity/Setting.java | 2 +- .../common/system/entity/Tenant.java | 2 +- .../gxwebsoft/common/system/entity/User.java | 2 +- .../common/system/entity/UserBalanceLog.java | 2 +- .../common/system/entity/UserCollection.java | 2 +- .../common/system/entity/UserFile.java | 2 +- .../common/system/entity/UserInfo.java | 2 +- .../common/system/entity/UserReferee.java | 2 +- .../common/system/entity/UserRole.java | 2 +- .../common/system/entity/UserRoleExtend.java | 2 +- .../common/system/entity/UserVerify.java | 2 +- .../mapper/xml/CompanyCommentMapper.xml | 2 +- .../mapper/xml/CompanyContentMapper.xml | 2 +- .../system/mapper/xml/CompanyGitMapper.xml | 2 +- .../system/mapper/xml/CompanyMapper.xml | 12 +- .../mapper/xml/CompanyParameterMapper.xml | 2 +- .../system/mapper/xml/CompanyUrlMapper.xml | 2 +- .../system/mapper/xml/DictDataMapper.xml | 2 +- .../mapper/xml/DictionaryDataMapper.xml | 4 +- .../common/system/mapper/xml/DomainMapper.xml | 2 +- .../system/mapper/xml/FileRecordMapper.xml | 4 +- .../system/mapper/xml/LoginRecordMapper.xml | 2 +- .../common/system/mapper/xml/MenuMapper.xml | 2 +- .../system/mapper/xml/OrganizationMapper.xml | 4 +- .../common/system/mapper/xml/PlugMapper.xml | 2 +- .../system/mapper/xml/RoleMenuMapper.xml | 10 +- .../common/system/mapper/xml/TenantMapper.xml | 2 +- .../mapper/xml/UserCollectionMapper.xml | 2 +- .../common/system/mapper/xml/UserMapper.xml | 2 +- .../system/mapper/xml/UserRefereeMapper.xml | 2 +- 52 files changed, 225 insertions(+), 63 deletions(-) create mode 100644 .workbuddy/memory/2026-07-18.md create mode 100644 docs/check_gxwebsoft_core_sys_tables.sql diff --git a/.workbuddy/memory/2026-07-18.md b/.workbuddy/memory/2026-07-18.md new file mode 100644 index 0000000..993115d --- /dev/null +++ b/.workbuddy/memory/2026-07-18.md @@ -0,0 +1,38 @@ +# 2026-07-18 + +## 生产日志报错分析（cms-api） + +用户贴了一段 cms-api 容器日志，三类信息，结论如下： + +1. **`Table 'modules.sys_user' doesn't exist`（真 bug，影响功能）** + - 根因：部署的 MySQL 库名是 `modules`（`application-prod.yml`/`application-cms.yml` 中 `jdbc:mysql://.../modules`），而 `common.system.entity.User` 实体 `@TableName("sys_user")`，且 cms 模块多处使用 `UserService`（`CmsNavigationController`、`CmsArticleController`、`LeadReferralServiceImpl` 等）。`modules` 库里缺 `sys_user` 系统表 → 任何依赖查 `sys_user` 的请求抛 `SQLSyntaxErrorException` → 500。 + - 性质：数据库初始化/迁移遗漏，**不是代码逻辑 bug**（代码正确，库缺表）。仓库内无 `sys_user` 建表 SQL，说明系统基础表由外部初始化脚本/主 server 工程提供。 + - 修复方向：在 `modules` 库执行系统基础 schema（建 `sys_user` 等系统表）。需找到对应 init SQL。 + +2. **`参数类型转换异常: 参数名=id, 传入值=resolveDomain/getByDomain/submitForm/.../NaN`（噪音，不影响）** + - 来源：`BaseController.handleMethodArgumentTypeMismatch`（`@ExceptionHandler(MethodArgumentTypeMismatchException)`），扫描器/爬虫用方法名字符串（resolveDomain、submitForm 等）和 NaN 探测 `id`(Integer) 参数，被拦截并返回友好错误。属公网 API 被扫描，无功能影响。建议：改用 logger 替代 `System.err.println`，必要时加限流/WAF。 + +3. **`定时任务需要查询所有租户的超时订单 list = 0`（正常，不影响）** + - 来源：`OrderCancelServiceImpl.findExpiredUnpaidOrders` 的 `System.out.println`，表示当前无超时未支付订单。正常运维日志。 + +## 修复：sys_ 系统表改指 gxwebsoft_core schema + +用户确认架构意图：系统表（sys_ 前缀）本就在中央库 `gxwebsoft_core`（与 `modules` 同实例 `1Panel-mysql-Bqdt`），pwl 模块 Mapper XML 早就在用 `gxwebsoft_core.sys_user`/`gxwebsoft_core.sys_dict_data`。原报错是实体 `@TableName("sys_xxx")` 默认落到数据源默认库 `modules` 导致表缺失。 + +已用脚本批量修改（精确、白名单防误伤）： +- 33 个实体 `@TableName("sys_xxx")` → `"gxwebsoft_core.sys_xxx"`（全部在 `common/system/entity`）。 +- 19 个 Mapper XML 里 `FROM/JOIN` 后的 `sys_` 表名加 `gxwebsoft_core.` 前缀（31 处，全在 `common/system/mapper/xml`）。 +- 其他模块（pwl/shop/app）对 sys_ 表的引用本来就是 `gxwebsoft_core.` 开头，未动。 +- `MybatisPlusConfig` 无全局表前缀，无冲突。 + +校验：裸 `@TableName("sys_`=0、裸 `FROM/JOIN sys_`=0、重复前缀=0。`UserInfo`/`EmailRecord`/`Payment` 等 sys_ 实体也已覆盖。 + +注意点（已告知用户）： +- 需重新编译/重启 cms-api 容器生效。 +- 确认 `modules` 库的连接账号对 `gxwebsoft_core` 有读写权限，且 `gxwebsoft_core` 里确实建齐了这些 sys_ 表。 +- 多租户插件会给查询加 `tenant_id`，表结构/字段不变则行为不变。 + +## 生成 gxwebsoft_core 缺失系统表检查 SQL + +从实体 `@TableName` 精确提取共 **31 张** `sys_` 表，生成 `docs/check_gxwebsoft_core_sys_tables.sql`。 +含四种查法：① 只列缺失表（结果空=齐全）② 逐张 EXISTS/MISSING 状态 ③ 期望31/实际/缺失数量统计 ④ 确认 gxwebsoft_core 库存在+账号有权限。基于 `information_schema.tables` 比对，无副作用只读。 diff --git a/docs/check_gxwebsoft_core_sys_tables.sql b/docs/check_gxwebsoft_core_sys_tables.sql new file mode 100644 index 0000000..6d83e00 --- /dev/null +++ b/docs/check_gxwebsoft_core_sys_tables.sql @@ -0,0 +1,124 @@ +-- ===================================================================== +-- 检查 gxwebsoft_core 库缺失的系统表（sys_ 前缀） +-- 用途：代码已把所有 @TableName / Mapper SQL 指向 gxwebsoft_core.sys_xxx， +-- 本脚本用于确认 gxwebsoft_core 库里这 31 张系统表是否都已建好。 +-- 用法：在能访问 gxwebsoft_core 的 MySQL 连接里执行。 +-- ===================================================================== + +-- --------------------------------------------------------------------- +-- 方式一（推荐）：一次性列出「缺失的表」。结果集为空 = 全部齐全。 +-- --------------------------------------------------------------------- +SELECT t.table_name AS missing_table +FROM ( + SELECT 'sys_company' AS table_name UNION ALL + SELECT 'sys_company_comment' UNION ALL + SELECT 'sys_company_content' UNION ALL + SELECT 'sys_company_git' UNION ALL + SELECT 'sys_company_parameter' UNION ALL + SELECT 'sys_company_url' UNION ALL + SELECT 'sys_dict' UNION ALL + SELECT 'sys_dict_data' UNION ALL + SELECT 'sys_dictionary' UNION ALL + SELECT 'sys_dictionary_data' UNION ALL + SELECT 'sys_domain' UNION ALL + SELECT 'sys_email_record' UNION ALL + SELECT 'sys_file_record' UNION ALL + SELECT 'sys_login_record' UNION ALL + SELECT 'sys_menu' UNION ALL + SELECT 'sys_operation_record' UNION ALL + SELECT 'sys_organization' UNION ALL + SELECT 'sys_payment' UNION ALL + SELECT 'sys_plug' UNION ALL + SELECT 'sys_role' UNION ALL + SELECT 'sys_role_menu' UNION ALL + SELECT 'sys_setting' UNION ALL + SELECT 'sys_tenant' UNION ALL + SELECT 'sys_user' UNION ALL + SELECT 'sys_user_balance_log' UNION ALL + SELECT 'sys_user_collection' UNION ALL + SELECT 'sys_user_file' UNION ALL + SELECT 'sys_user_referee' UNION ALL + SELECT 'sys_user_role' UNION ALL + SELECT 'sys_user_role_extend' UNION ALL + SELECT 'sys_user_verify' +) t +LEFT JOIN information_schema.tables ist + ON ist.table_schema = 'gxwebsoft_core' + AND ist.table_name = t.table_name +WHERE ist.table_name IS NULL +ORDER BY t.table_name; + + +-- --------------------------------------------------------------------- +-- 方式二：逐张列出状态（EXISTS / MISSING），一目了然看全貌。 +-- --------------------------------------------------------------------- +SELECT + t.table_name, + CASE WHEN ist.table_name IS NULL THEN 'MISSING' ELSE 'EXISTS' END AS status +FROM ( + SELECT 'sys_company' AS table_name UNION ALL + SELECT 'sys_company_comment' UNION ALL + SELECT 'sys_company_content' UNION ALL + SELECT 'sys_company_git' UNION ALL + SELECT 'sys_company_parameter' UNION ALL + SELECT 'sys_company_url' UNION ALL + SELECT 'sys_dict' UNION ALL + SELECT 'sys_dict_data' UNION ALL + SELECT 'sys_dictionary' UNION ALL + SELECT 'sys_dictionary_data' UNION ALL + SELECT 'sys_domain' UNION ALL + SELECT 'sys_email_record' UNION ALL + SELECT 'sys_file_record' UNION ALL + SELECT 'sys_login_record' UNION ALL + SELECT 'sys_menu' UNION ALL + SELECT 'sys_operation_record' UNION ALL + SELECT 'sys_organization' UNION ALL + SELECT 'sys_payment' UNION ALL + SELECT 'sys_plug' UNION ALL + SELECT 'sys_role' UNION ALL + SELECT 'sys_role_menu' UNION ALL + SELECT 'sys_setting' UNION ALL + SELECT 'sys_tenant' UNION ALL + SELECT 'sys_user' UNION ALL + SELECT 'sys_user_balance_log' UNION ALL + SELECT 'sys_user_collection' UNION ALL + SELECT 'sys_user_file' UNION ALL + SELECT 'sys_user_referee' UNION ALL + SELECT 'sys_user_role' UNION ALL + SELECT 'sys_user_role_extend' UNION ALL + SELECT 'sys_user_verify' +) t +LEFT JOIN information_schema.tables ist + ON ist.table_schema = 'gxwebsoft_core' + AND ist.table_name = t.table_name +ORDER BY status DESC, t.table_name; + + +-- --------------------------------------------------------------------- +-- 方式三：统计汇总（应有 31 张，看实际存在几张）。 +-- --------------------------------------------------------------------- +SELECT + 31 AS expected_count, + COUNT(*) AS existing_count, + 31 - COUNT(*) AS missing_count +FROM information_schema.tables +WHERE table_schema = 'gxwebsoft_core' + AND table_name IN ( + 'sys_company','sys_company_comment','sys_company_content','sys_company_git', + 'sys_company_parameter','sys_company_url','sys_dict','sys_dict_data', + 'sys_dictionary','sys_dictionary_data','sys_domain','sys_email_record', + 'sys_file_record','sys_login_record','sys_menu','sys_operation_record', + 'sys_organization','sys_payment','sys_plug','sys_role','sys_role_menu', + 'sys_setting','sys_tenant','sys_user','sys_user_balance_log', + 'sys_user_collection','sys_user_file','sys_user_referee','sys_user_role', + 'sys_user_role_extend','sys_user_verify' + ); + + +-- --------------------------------------------------------------------- +-- 附：确认连接账号能访问 gxwebsoft_core（库是否存在 + 是否有权限）。 +-- 若这条查不到结果，说明库不存在或当前账号无权限。 +-- --------------------------------------------------------------------- +SELECT schema_name +FROM information_schema.schemata +WHERE schema_name = 'gxwebsoft_core'; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Company.java b/src/main/java/com/gxwebsoft/common/system/entity/Company.java index 9e37455..1c79d50 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Company.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Company.java @@ -22,7 +22,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "Company对象", description = "企业信息") -@TableName("sys_company") +@TableName("gxwebsoft_core.sys_company") public class Company implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/CompanyComment.java b/src/main/java/com/gxwebsoft/common/system/entity/CompanyComment.java index 5ad0b6b..dcd2636 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/CompanyComment.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/CompanyComment.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "CompanyComment对象", description = "应用评论") -@TableName("sys_company_comment") +@TableName("gxwebsoft_core.sys_company_comment") public class CompanyComment implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/CompanyContent.java b/src/main/java/com/gxwebsoft/common/system/entity/CompanyContent.java index 1230838..f39ec99 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/CompanyContent.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/CompanyContent.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "CompanyContent对象", description = "应用详情") -@TableName("sys_company_content") +@TableName("gxwebsoft_core.sys_company_content") public class CompanyContent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/CompanyGit.java b/src/main/java/com/gxwebsoft/common/system/entity/CompanyGit.java index b8d482b..6c0ac6e 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/CompanyGit.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/CompanyGit.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "CompanyGit对象", description = "代码仓库") -@TableName("sys_company_git") +@TableName("gxwebsoft_core.sys_company_git") public class CompanyGit implements Serializable { private static final long serialVersionUID = 1L; @@ -74,7 +74,7 @@ public class CompanyGit implements Serializable { @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "UserBalanceLog对象", description = "用户余额变动明细表") - @TableName("sys_user_balance_log") + @TableName("gxwebsoft_core.sys_user_balance_log") public static class UserBalanceLog implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/CompanyParameter.java b/src/main/java/com/gxwebsoft/common/system/entity/CompanyParameter.java index e2c0718..4873fe1 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/CompanyParameter.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/CompanyParameter.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "CompanyParameter对象", description = "应用参数") -@TableName("sys_company_parameter") +@TableName("gxwebsoft_core.sys_company_parameter") public class CompanyParameter implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/CompanyUrl.java b/src/main/java/com/gxwebsoft/common/system/entity/CompanyUrl.java index 1bee66a..945c161 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/CompanyUrl.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/CompanyUrl.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "CompanyUrl对象", description = "应用域名") -@TableName("sys_company_url") +@TableName("gxwebsoft_core.sys_company_url") public class CompanyUrl implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Dict.java b/src/main/java/com/gxwebsoft/common/system/entity/Dict.java index 35f9c61..61bcf59 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Dict.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Dict.java @@ -18,7 +18,7 @@ import java.util.Set; */ @Data @Schema(description = "字典(业务类)") -@TableName("sys_dict") +@TableName("gxwebsoft_core.sys_dict") public class Dict implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/DictData.java b/src/main/java/com/gxwebsoft/common/system/entity/DictData.java index e9bf6e9..5b0fac4 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/DictData.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/DictData.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @Schema(description = "字典数据(业务类)") -@TableName("sys_dict_data") +@TableName("gxwebsoft_core.sys_dict_data") public class DictData implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Dictionary.java b/src/main/java/com/gxwebsoft/common/system/entity/Dictionary.java index b184758..2ef04b6 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Dictionary.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Dictionary.java @@ -21,7 +21,7 @@ import lombok.Data; */ @Data @Schema(description = "字典(系统类)") -@TableName("sys_dictionary") +@TableName("gxwebsoft_core.sys_dictionary") public class Dictionary implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/DictionaryData.java b/src/main/java/com/gxwebsoft/common/system/entity/DictionaryData.java index 9f9ed86..e59ed7e 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/DictionaryData.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/DictionaryData.java @@ -18,7 +18,7 @@ import lombok.Data; */ @Data @Schema(description = "字典数据(系统类)") -@TableName("sys_dictionary_data") +@TableName("gxwebsoft_core.sys_dictionary_data") public class DictionaryData implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Domain.java b/src/main/java/com/gxwebsoft/common/system/entity/Domain.java index c9fc263..1a1cfd7 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Domain.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Domain.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "Domain对象", description = "授权域名") -@TableName("sys_domain") +@TableName("gxwebsoft_core.sys_domain") public class Domain implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/EmailRecord.java b/src/main/java/com/gxwebsoft/common/system/entity/EmailRecord.java index 1831835..1331452 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/EmailRecord.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/EmailRecord.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @Schema(description = "邮件发送记录") -@TableName("sys_email_record") +@TableName("gxwebsoft_core.sys_email_record") public class EmailRecord implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java b/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java index f846af5..bbebbee 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @Schema(description = "文件上传记录") -@TableName("sys_file_record") +@TableName("gxwebsoft_core.sys_file_record") public class FileRecord implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java b/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java index b516166..ef53211 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @Schema(description = "登录日志") -@TableName("sys_login_record") +@TableName("gxwebsoft_core.sys_login_record") public class LoginRecord implements Serializable { private static final long serialVersionUID = 1L; public static final int TYPE_LOGIN = 0; // 登录成功 diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Menu.java b/src/main/java/com/gxwebsoft/common/system/entity/Menu.java index 7e1e4b0..90e5660 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Menu.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Menu.java @@ -17,7 +17,7 @@ import java.util.List; */ @Data @Schema(description = "菜单") -@TableName("sys_menu") +@TableName("gxwebsoft_core.sys_menu") @JsonIgnoreProperties(ignoreUnknown = true) public class Menu implements GrantedAuthority { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Organization.java b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java index 215a64c..67701e4 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Organization.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java @@ -18,7 +18,7 @@ import lombok.Data; */ @Data @Schema(description = "组织机构") -@TableName("sys_organization") +@TableName("gxwebsoft_core.sys_organization") public class Organization implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Payment.java b/src/main/java/com/gxwebsoft/common/system/entity/Payment.java index 819ff36..cc654fc 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Payment.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Payment.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "Payment对象", description = "支付方式") -@TableName("sys_payment") +@TableName("gxwebsoft_core.sys_payment") public class Payment implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Plug.java b/src/main/java/com/gxwebsoft/common/system/entity/Plug.java index b8ef784..96db35a 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Plug.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Plug.java @@ -21,7 +21,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "Plug对象", description = "插件扩展") -@TableName("sys_plug") +@TableName("gxwebsoft_core.sys_plug") public class Plug implements Serializable { private static final long serialVersionUID = 1L; public static final int TYPE_MENU = 0; // 菜单类型 diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Role.java b/src/main/java/com/gxwebsoft/common/system/entity/Role.java index 2859ce9..535fcc7 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Role.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Role.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @Schema(description = "角色") -@TableName("sys_role") +@TableName("gxwebsoft_core.sys_role") public class Role implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/RoleMenu.java b/src/main/java/com/gxwebsoft/common/system/entity/RoleMenu.java index 14781c7..689aad0 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/RoleMenu.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/RoleMenu.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @Schema(description = "角色权限") -@TableName("sys_role_menu") +@TableName("gxwebsoft_core.sys_role_menu") public class RoleMenu implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Setting.java b/src/main/java/com/gxwebsoft/common/system/entity/Setting.java index 336bc2e..8887fc9 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Setting.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Setting.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "Setting对象", description = "系统设置") -@TableName("sys_setting") +@TableName("gxwebsoft_core.sys_setting") public class Setting implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java index fc5f804..9448c7a 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java @@ -20,7 +20,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "Tenant对象", description = "租户") -@TableName("sys_tenant") +@TableName("gxwebsoft_core.sys_tenant") public class Tenant implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java index ca83722..287de5a 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/User.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -21,7 +21,7 @@ import java.util.List; */ @Data @Schema(description = "用户") -@TableName("sys_user") +@TableName("gxwebsoft_core.sys_user") public class User implements UserDetails { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserBalanceLog.java b/src/main/java/com/gxwebsoft/common/system/entity/UserBalanceLog.java index bd62f51..b7c6ee6 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/UserBalanceLog.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserBalanceLog.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "UserBalanceLog对象", description = "用户余额变动明细表") -@TableName("sys_user_balance_log") +@TableName("gxwebsoft_core.sys_user_balance_log") public class UserBalanceLog implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserCollection.java b/src/main/java/com/gxwebsoft/common/system/entity/UserCollection.java index 89133e9..4edc225 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/UserCollection.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserCollection.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "UserCollection对象", description = "我的收藏") -@TableName("sys_user_collection") +@TableName("gxwebsoft_core.sys_user_collection") public class UserCollection implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserFile.java b/src/main/java/com/gxwebsoft/common/system/entity/UserFile.java index f99ec96..2a59de4 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/UserFile.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserFile.java @@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "UserFile对象", description = "用户文件") -@TableName("sys_user_file") +@TableName("gxwebsoft_core.sys_user_file") public class UserFile implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserInfo.java b/src/main/java/com/gxwebsoft/common/system/entity/UserInfo.java index ecf46eb..fbb5d00 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/UserInfo.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserInfo.java @@ -18,7 +18,7 @@ import java.util.List; */ @Data @Schema(description = "用户") -@TableName("sys_user") +@TableName("gxwebsoft_core.sys_user") public class UserInfo { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserReferee.java b/src/main/java/com/gxwebsoft/common/system/entity/UserReferee.java index b836af8..274c578 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/UserReferee.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserReferee.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "UserReferee对象", description = "用户推荐关系表") -@TableName("sys_user_referee") +@TableName("gxwebsoft_core.sys_user_referee") public class UserReferee implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserRole.java b/src/main/java/com/gxwebsoft/common/system/entity/UserRole.java index 9308dd9..55cba16 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/UserRole.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserRole.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @Schema(description = "用户角色") -@TableName("sys_user_role") +@TableName("gxwebsoft_core.sys_user_role") public class UserRole implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserRoleExtend.java b/src/main/java/com/gxwebsoft/common/system/entity/UserRoleExtend.java index 092973c..5b90f9f 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/UserRoleExtend.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserRoleExtend.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; * @since 2026-04-14 */ @Data -@TableName("sys_user_role_extend") +@TableName("gxwebsoft_core.sys_user_role_extend") @Schema(name = "UserRoleExtend", description = "用户角色扩展") public class UserRoleExtend implements Serializable { diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java b/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java index 0f74385..e8758e7 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Schema(name = "UserVerify对象", description = "实名认证") -@TableName("sys_user_verify") +@TableName("gxwebsoft_core.sys_user_verify") public class UserVerify implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyCommentMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyCommentMapper.xml index 0e04c48..156f59f 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyCommentMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyCommentMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_company_comment a + FROM gxwebsoft_core.sys_company_comment a AND a.id = #{param.id} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyContentMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyContentMapper.xml index 06207e5..08e2a96 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyContentMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyContentMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_company_content a + FROM gxwebsoft_core.sys_company_content a AND a.id = #{param.id} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyGitMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyGitMapper.xml index bf8c616..fb87b6c 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyGitMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyGitMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_company_git a + FROM gxwebsoft_core.sys_company_git a AND a.id = #{param.id} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml index ad61d39..33f0a3d 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml @@ -156,8 +156,8 @@ SELECT a.* - FROM sys_company a WHERE a.tenant_id = #{tenantId} and a.deleted = 0 + FROM gxwebsoft_core.sys_company a WHERE a.tenant_id = #{tenantId} and a.deleted = 0 diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyParameterMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyParameterMapper.xml index eabfba2..491c47a 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyParameterMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyParameterMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_company_parameter a + FROM gxwebsoft_core.sys_company_parameter a AND a.id = #{param.id} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyUrlMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyUrlMapper.xml index 6db9462..c51f1b5 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyUrlMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyUrlMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_company_url a + FROM gxwebsoft_core.sys_company_url a AND a.id = #{param.id} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictDataMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictDataMapper.xml index a831629..c5d4aef 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictDataMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictDataMapper.xml @@ -62,7 +62,7 @@ SELECT a.*, b.dict_code, b.dict_name - FROM sys_dict_data a + FROM gxwebsoft_core.sys_dict_data a LEFT JOIN gxwebsoft_core.sys_dict b ON a.dict_id = b.dict_id WHERE a.dict_data_name = #{dictDataName} AND b.dict_code = #{dictCode} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryDataMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryDataMapper.xml index 886303b..b3065f6 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryDataMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryDataMapper.xml @@ -7,7 +7,7 @@ SELECT a.*, b.dict_code, b.dict_name - FROM sys_dictionary_data a + FROM gxwebsoft_core.sys_dictionary_data a LEFT JOIN gxwebsoft_core.sys_dictionary b ON a.dict_id = b.dict_id AND a.deleted = 0 @@ -62,7 +62,7 @@ SELECT a.*, b.dict_code, b.dict_name - FROM sys_dictionary_data a + FROM gxwebsoft_core.sys_dictionary_data a LEFT JOIN gxwebsoft_core.sys_dictionary b ON a.dict_id = b.dict_id WHERE a.dict_data_name = #{dictDataName} AND b.dict_code = #{dictCode} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/DomainMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DomainMapper.xml index 1299cf7..2f737be 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/DomainMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/DomainMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_domain a + FROM gxwebsoft_core.sys_domain a AND a.id = #{param.id} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/FileRecordMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/FileRecordMapper.xml index 1a7dd22..26982b4 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/FileRecordMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/FileRecordMapper.xml @@ -9,7 +9,7 @@ b.nickname create_nickname, b.avatar, c.merchant_code - FROM sys_file_record a + FROM gxwebsoft_core.sys_file_record a LEFT JOIN gxwebsoft_core.sys_user b ON a.create_user_id = b.user_id LEFT JOIN shop_merchant c ON a.merchant_code = c.merchant_code @@ -68,7 +68,7 @@ diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/LoginRecordMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/LoginRecordMapper.xml index 397c525..d16b25c 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/LoginRecordMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/LoginRecordMapper.xml @@ -7,7 +7,7 @@ SELECT a.*, b.user_id, b.nickname - FROM sys_login_record a + FROM gxwebsoft_core.sys_login_record a LEFT JOIN gxwebsoft_core.sys_user b ON a.username = b.username diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml index 0897489..d00f6e2 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/MenuMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_menu a + FROM gxwebsoft_core.sys_menu a AND a.menu_id = #{param.menuId} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml index ed5d3c8..feba0ef 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml @@ -5,7 +5,7 @@ SELECT ta.* - FROM sys_dictionary_data ta + FROM gxwebsoft_core.sys_dictionary_data ta LEFT JOIN gxwebsoft_core.sys_dictionary tb ON ta.dict_id = tb.dict_id AND tb.deleted = 0 @@ -19,7 +19,7 @@ b.dict_data_name organization_type_name, c.nickname leader_nickname, c.username leader_username - FROM sys_organization a + FROM gxwebsoft_core.sys_organization a LEFT JOIN ( ) b ON a.organization_type = b.dict_data_code diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/PlugMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/PlugMapper.xml index 45e3aac..cb7022f 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/PlugMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/PlugMapper.xml @@ -5,7 +5,7 @@ SELECT a.*,b.tenant_name,c.company_name,c.short_name,c.domain - FROM sys_plug a + FROM gxwebsoft_core.sys_plug a LEFT JOIN gxwebsoft_core.sys_tenant b ON a.tenant_id = b.tenant_id LEFT JOIN gxwebsoft_core.sys_company c ON a.tenant_id = c.tenant_id diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMenuMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMenuMapper.xml index 141c53c..16c1733 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMenuMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMenuMapper.xml @@ -5,11 +5,11 @@ SELECT a.* - FROM sys_menu a + FROM gxwebsoft_core.sys_menu a - AND a.menu_id IN (SELECT menu_id FROM sys_role_menu WHERE role_id IN + AND a.menu_id IN (SELECT menu_id FROM gxwebsoft_core.sys_role_menu WHERE role_id IN #{roleId} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml index 83ba5b2..994b073 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_tenant a + FROM gxwebsoft_core.sys_tenant a AND a.tenant_id = #{param.tenantId} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserCollectionMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserCollectionMapper.xml index 9b60a69..c30ec5e 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserCollectionMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserCollectionMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_user_collection a + FROM gxwebsoft_core.sys_user_collection a AND a.id = #{param.id} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml index 4a2a32e..9718d2b 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml @@ -145,7 +145,7 @@ ) - AND a.organization_id IN (SELECT organization_id FROM sys_organization WHERE parent_id=#{param.parentId}) + AND a.organization_id IN (SELECT organization_id FROM gxwebsoft_core.sys_organization WHERE parent_id=#{param.parentId}) diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserRefereeMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserRefereeMapper.xml index 67943f7..a54b348 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserRefereeMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserRefereeMapper.xml @@ -5,7 +5,7 @@ SELECT a.* - FROM sys_user_referee a + FROM gxwebsoft_core.sys_user_referee a AND a.id = #{param.id}