From 797c36d9a75f033b30b9bb090a3c28225381538d Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sun, 16 Jul 2023 12:31:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E7=A7=B0=E5=89=8D=E7=BC=80sys=5F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/customer/modular/entity/Customer.java | 2 +- .../roses/kernel/sys/modular/org/entity/HrOrgApprover.java | 2 +- .../roses/kernel/sys/modular/org/entity/HrOrganization.java | 2 +- .../sys/modular/org/pojo/request/HrOrganizationRequest.java | 2 +- .../modular/org/service/impl/HrOrganizationServiceImpl.java | 4 ++-- .../roses/kernel/sys/modular/position/entity/HrPosition.java | 2 +- .../sys/modular/user/service/impl/SysUserOrgServiceImpl.java | 2 +- .../kernel/sys/modular/userapp/entity/PortalUserApp.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/entity/Customer.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/entity/Customer.java index 545ead3c2..afd0bbbda 100644 --- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/entity/Customer.java +++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/entity/Customer.java @@ -17,7 +17,7 @@ import java.util.Date; * @author fengshuonan * @since 2021/06/07 11:40 */ -@TableName("toc_customer") +@TableName("sys_toc_customer") @Data @EqualsAndHashCode(callSuper = true) public class Customer extends BaseEntity { diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrgApprover.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrgApprover.java index 3ee3ecdda..adec9088e 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrgApprover.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrgApprover.java @@ -19,7 +19,7 @@ import java.util.List; * @author fengshuonan * @date 2023/06/10 21:23 */ -@TableName("hr_org_approver") +@TableName("sys_hr_org_approver") @Data @EqualsAndHashCode(callSuper = true) public class HrOrgApprover extends BaseEntity { diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java index cf3c0a5f7..f83b26d21 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java @@ -19,7 +19,7 @@ import java.util.List; * @author fengshuonan * @date 2023/06/10 21:23 */ -@TableName(value = "hr_organization", autoResultMap = true) +@TableName(value = "sys_hr_organization", autoResultMap = true) @Data @EqualsAndHashCode(callSuper = true) public class HrOrganization extends BaseExpandFieldEntity implements AbstractTreeNode { diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java index 7660db331..4fbd99a1a 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java @@ -60,7 +60,7 @@ public class HrOrganizationRequest extends BaseRequest { */ @NotBlank(message = "组织编码不能为空", groups = {add.class, edit.class}) @ChineseDescription("组织编码") - @TableUniqueValue(message = "组织编码存在重复", groups = {add.class, edit.class}, tableName = "hr_organization", + @TableUniqueValue(message = "组织编码存在重复", groups = {add.class, edit.class}, tableName = "sys_hr_organization", columnName = "org_code", idFieldName = "org_id", excludeLogicDeleteItems = true) private String orgCode; diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java index cb22269b0..40f515221 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java @@ -91,7 +91,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl totalOrgIdSet = DbOperatorContext.me() - .findSubListByParentId("hr_organization", "org_pids", "org_id", hrOrganizationRequest.getOrgId()); + .findSubListByParentId("sys_hr_organization", "org_pids", "org_id", hrOrganizationRequest.getOrgId()); totalOrgIdSet.add(hrOrganizationRequest.getOrgId()); // 执行删除操作 @@ -110,7 +110,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl tempSubOrgIdList = DbOperatorContext.me().findSubListByParentId("hr_organization", "org_pids", "org_id", orgId); + Set tempSubOrgIdList = DbOperatorContext.me().findSubListByParentId("sys_hr_organization", "org_pids", "org_id", orgId); orgIdList.addAll(tempSubOrgIdList); } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/entity/HrPosition.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/entity/HrPosition.java index da713ad5b..25c9db031 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/entity/HrPosition.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/entity/HrPosition.java @@ -17,7 +17,7 @@ import java.math.BigDecimal; * @author fengshuonan * @date 2023/06/10 21:25 */ -@TableName(value = "hr_position", autoResultMap = true) +@TableName(value = "sys_hr_position", autoResultMap = true) @Data @EqualsAndHashCode(callSuper = true) public class HrPosition extends BaseExpandFieldEntity { diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java index 30e2524ce..5d0f32567 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java @@ -193,7 +193,7 @@ public class SysUserOrgServiceImpl extends ServiceImpl subOrgIdList = dbOperatorApi.findSubListByParentId("hr_organization", "org_pids", "org_id", orgId); + Set subOrgIdList = dbOperatorApi.findSubListByParentId("sys_hr_organization", "org_pids", "org_id", orgId); subOrgIdList.add(orgId); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/userapp/entity/PortalUserApp.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/userapp/entity/PortalUserApp.java index 8f34b3760..bd0b3fc9d 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/userapp/entity/PortalUserApp.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/userapp/entity/PortalUserApp.java @@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode; * @author fengshuonan * @date 2023/06/26 21:25 */ -@TableName("portal_user_app") +@TableName("sys_portal_user_app") @Data @EqualsAndHashCode(callSuper = true) public class PortalUserApp extends BaseEntity {