mirror of https://gitee.com/stylefeng/roses
【8.0】统一表名称前缀sys_
parent
9faee426f3
commit
797c36d9a7
|
@ -17,7 +17,7 @@ import java.util.Date;
|
||||||
* @author fengshuonan
|
* @author fengshuonan
|
||||||
* @since 2021/06/07 11:40
|
* @since 2021/06/07 11:40
|
||||||
*/
|
*/
|
||||||
@TableName("toc_customer")
|
@TableName("sys_toc_customer")
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
public class Customer extends BaseEntity {
|
public class Customer extends BaseEntity {
|
||||||
|
|
|
@ -19,7 +19,7 @@ import java.util.List;
|
||||||
* @author fengshuonan
|
* @author fengshuonan
|
||||||
* @date 2023/06/10 21:23
|
* @date 2023/06/10 21:23
|
||||||
*/
|
*/
|
||||||
@TableName("hr_org_approver")
|
@TableName("sys_hr_org_approver")
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
public class HrOrgApprover extends BaseEntity {
|
public class HrOrgApprover extends BaseEntity {
|
||||||
|
|
|
@ -19,7 +19,7 @@ import java.util.List;
|
||||||
* @author fengshuonan
|
* @author fengshuonan
|
||||||
* @date 2023/06/10 21:23
|
* @date 2023/06/10 21:23
|
||||||
*/
|
*/
|
||||||
@TableName(value = "hr_organization", autoResultMap = true)
|
@TableName(value = "sys_hr_organization", autoResultMap = true)
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
public class HrOrganization extends BaseExpandFieldEntity implements AbstractTreeNode<HrOrganization> {
|
public class HrOrganization extends BaseExpandFieldEntity implements AbstractTreeNode<HrOrganization> {
|
||||||
|
|
|
@ -60,7 +60,7 @@ public class HrOrganizationRequest extends BaseRequest {
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "组织编码不能为空", groups = {add.class, edit.class})
|
@NotBlank(message = "组织编码不能为空", groups = {add.class, edit.class})
|
||||||
@ChineseDescription("组织编码")
|
@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)
|
columnName = "org_code", idFieldName = "org_id", excludeLogicDeleteItems = true)
|
||||||
private String orgCode;
|
private String orgCode;
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
|
||||||
|
|
||||||
// 查询被删除组织机构的所有子级节点
|
// 查询被删除组织机构的所有子级节点
|
||||||
Set<Long> totalOrgIdSet = DbOperatorContext.me()
|
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());
|
totalOrgIdSet.add(hrOrganizationRequest.getOrgId());
|
||||||
|
|
||||||
// 执行删除操作
|
// 执行删除操作
|
||||||
|
@ -110,7 +110,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
|
||||||
// 批量查询组织机构下的下属机构
|
// 批量查询组织机构下的下属机构
|
||||||
for (Long orgId : orgIdList) {
|
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);
|
orgIdList.addAll(tempSubOrgIdList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ import java.math.BigDecimal;
|
||||||
* @author fengshuonan
|
* @author fengshuonan
|
||||||
* @date 2023/06/10 21:25
|
* @date 2023/06/10 21:25
|
||||||
*/
|
*/
|
||||||
@TableName(value = "hr_position", autoResultMap = true)
|
@TableName(value = "sys_hr_position", autoResultMap = true)
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
public class HrPosition extends BaseExpandFieldEntity {
|
public class HrPosition extends BaseExpandFieldEntity {
|
||||||
|
|
|
@ -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);
|
subOrgIdList.add(orgId);
|
||||||
|
|
||||||
LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
|
|
@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
|
||||||
* @author fengshuonan
|
* @author fengshuonan
|
||||||
* @date 2023/06/26 21:25
|
* @date 2023/06/26 21:25
|
||||||
*/
|
*/
|
||||||
@TableName("portal_user_app")
|
@TableName("sys_portal_user_app")
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
public class PortalUserApp extends BaseEntity {
|
public class PortalUserApp extends BaseEntity {
|
||||||
|
|
Loading…
Reference in New Issue