|
@@ -20,6 +20,8 @@ import org.dromara.main.mapper.MainAuditMapper;
|
|
|
import org.dromara.main.mapper.MainBackCandidateMapper;
|
|
import org.dromara.main.mapper.MainBackCandidateMapper;
|
|
|
import org.dromara.main.mapper.MainPostApplyMapper;
|
|
import org.dromara.main.mapper.MainPostApplyMapper;
|
|
|
import org.dromara.main.service.IMainPostApplyService;
|
|
import org.dromara.main.service.IMainPostApplyService;
|
|
|
|
|
+import org.dromara.system.domain.vo.SysTenantVo;
|
|
|
|
|
+import org.dromara.system.service.ISysTenantService;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
@@ -40,6 +42,7 @@ public class MainPostApplyServiceImpl implements IMainPostApplyService {
|
|
|
private final MainPostApplyMapper baseMapper;
|
|
private final MainPostApplyMapper baseMapper;
|
|
|
private final MainAuditMapper mainAuditMapper;
|
|
private final MainAuditMapper mainAuditMapper;
|
|
|
private final MainBackCandidateMapper mainBackCandidateMapper;
|
|
private final MainBackCandidateMapper mainBackCandidateMapper;
|
|
|
|
|
+ private final ISysTenantService sysTenantService;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public TableDataInfo<MainPostApplyVo> queryPageList(MainPostApplyBo bo, PageQuery pageQuery) {
|
|
public TableDataInfo<MainPostApplyVo> queryPageList(MainPostApplyBo bo, PageQuery pageQuery) {
|
|
@@ -65,6 +68,12 @@ public class MainPostApplyServiceImpl implements IMainPostApplyService {
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Boolean insertByBo(MainPostApplyBo bo) {
|
|
public Boolean insertByBo(MainPostApplyBo bo) {
|
|
|
|
|
+ if (cn.hutool.core.util.StrUtil.isBlank(bo.getCompanyName()) && cn.hutool.core.util.StrUtil.isNotBlank(bo.getTenantId())) {
|
|
|
|
|
+ SysTenantVo tenantVo = sysTenantService.queryByTenantId(bo.getTenantId());
|
|
|
|
|
+ if (tenantVo != null) {
|
|
|
|
|
+ bo.setCompanyName(tenantVo.getCompanyName());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
MainPostApply add = MapstructUtils.convert(bo, MainPostApply.class);
|
|
MainPostApply add = MapstructUtils.convert(bo, MainPostApply.class);
|
|
|
validEntityBeforeSave(add);
|
|
validEntityBeforeSave(add);
|
|
|
boolean flag = baseMapper.insert(add) > 0;
|
|
boolean flag = baseMapper.insert(add) > 0;
|
|
@@ -82,6 +91,12 @@ public class MainPostApplyServiceImpl implements IMainPostApplyService {
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Boolean updateByBo(MainPostApplyBo bo) {
|
|
public Boolean updateByBo(MainPostApplyBo bo) {
|
|
|
|
|
+ if (cn.hutool.core.util.StrUtil.isBlank(bo.getCompanyName()) && cn.hutool.core.util.StrUtil.isNotBlank(bo.getTenantId())) {
|
|
|
|
|
+ SysTenantVo tenantVo = sysTenantService.queryByTenantId(bo.getTenantId());
|
|
|
|
|
+ if (tenantVo != null) {
|
|
|
|
|
+ bo.setCompanyName(tenantVo.getCompanyName());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
MainPostApply update = MapstructUtils.convert(bo, MainPostApply.class);
|
|
MainPostApply update = MapstructUtils.convert(bo, MainPostApply.class);
|
|
|
validEntityBeforeSave(update);
|
|
validEntityBeforeSave(update);
|
|
|
update.setApplyStatus(0);
|
|
update.setApplyStatus(0);
|