gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【8.0】统一表名称前缀sys_

pull/57/head
fengshuonan 2023-07-16 12:31:32 +08:00
parent 9faee426f3
commit 797c36d9a7
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/entity/Customer.java
View File

@ -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 {

2
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrgApprover.java
View File

@ -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 {

2
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java
View File

@ -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<HrOrganization> {

2
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java
View File

@ -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;

4
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
View File

@ -91,7 +91,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
// 查询被删除组织机构的所有子级节点
Set<Long> 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<HrOrganizationMapper,
// 批量查询组织机构下的下属机构
for (Long orgId : orgIdList) {
// 查询被删除组织机构的所有子级节点
Set<Long> tempSubOrgIdList = DbOperatorContext.me().findSubListByParentId("hr_organization", "org_pids", "org_id", orgId);
Set<Long> tempSubOrgIdList = DbOperatorContext.me().findSubListByParentId("sys_hr_organization", "org_pids", "org_id", orgId);
orgIdList.addAll(tempSubOrgIdList);
}

2
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/entity/HrPosition.java
View File

@ -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 {

2
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
View File

@ -193,7 +193,7 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgMapper, SysUser
}
// 如果包含查询子公司，以及子公司的子公司
Set<Long> subOrgIdList = dbOperatorApi.findSubListByParentId("hr_organization", "org_pids", "org_id", orgId);
Set<Long> subOrgIdList = dbOperatorApi.findSubListByParentId("sys_hr_organization", "org_pids", "org_id", orgId);
subOrgIdList.add(orgId);
LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>();

2
kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/userapp/entity/PortalUserApp.java
View File

@ -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 {