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

【7.2.2】【expand】组织机构增加动态数据

pull/29/head
fengshuonan 2022-04-01 14:28:11 +08:00
parent dcd867c64f
commit d9365ca376
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java
View File

@ -24,6 +24,7 @@
*/
package cn.stylefeng.roses.kernel.system.api.pojo.organization;
import cn.stylefeng.roses.kernel.expand.modular.api.pojo.ExpandDataInfo;
import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue;
@ -121,6 +122,12 @@ public class HrOrganizationRequest extends BaseRequest {
@ChineseDescription("用户id（作为查询条件）")
private Long userId;
/**
* 动态表单数据
*/
@ChineseDescription("动态表单数据")
private ExpandDataInfo expandDataInfo;
/**
* 组织机构树zTree形式
*/

18
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
View File

@ -37,6 +37,7 @@ import cn.stylefeng.roses.kernel.db.api.context.DbOperatorContext;
import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.expand.modular.api.ExpandApi;
import cn.stylefeng.roses.kernel.rule.constants.SymbolConstant;
import cn.stylefeng.roses.kernel.rule.constants.TreeConstants;
import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
@ -90,7 +91,11 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
@Resource
private RoleDataScopeServiceApi roleDataScopeServiceApi;
@Resource
private ExpandApi expandApi;
@Override
@Transactional(rollbackFor = Exception.class)
public void add(HrOrganizationRequest hrOrganizationRequest) {
// 获取父id
@ -109,6 +114,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
hrOrganization.setStatusFlag(StatusEnum.ENABLE.getCode());
this.save(hrOrganization);
// 处理动态表单数据
if (hrOrganizationRequest.getExpandDataInfo() != null) {
hrOrganizationRequest.getExpandDataInfo().setPrimaryFieldValue(hrOrganization.getOrgId());
expandApi.saveOrUpdateExpandData(hrOrganizationRequest.getExpandDataInfo());
}
}
@Override
@ -143,6 +154,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
}
@Override
@Transactional(rollbackFor = Exception.class)
public void edit(HrOrganizationRequest hrOrganizationRequest) {
HrOrganization hrOrganization = this.queryOrganization(hrOrganizationRequest);
@ -161,6 +173,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
// 更新这条记录
this.updateById(hrOrganization);
// 处理动态表单数据
if (hrOrganizationRequest.getExpandDataInfo() != null) {
hrOrganizationRequest.getExpandDataInfo().setPrimaryFieldValue(hrOrganization.getOrgId());
expandApi.saveOrUpdateExpandData(hrOrganizationRequest.getExpandDataInfo());
}
}
@Override