yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(crm): 修复礼品申请部门ID缺失问题

Browse Source 
- 修复查询条件构造中的缩进格式问题
- 添加申请部门ID自动补齐逻辑，当前端未传递时从登录用户获取
- 增加异常处理避免因部门ID获取失败导致提交异常
- 保持原有草稿状态默认设置逻辑
dev
zangch@mesnac.com 4 days ago
parent 24188870ca
commit c66858aec7
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File

44
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyServiceImpl.java
Unescape Escape View File

@ -119,24 +119,24 @@ public class CrmGiftApplyServiceImpl implements ICrmGiftApplyService {
MPJLambdaWrapper<CrmGiftApply> lqw = JoinWrappers.lambda(CrmGiftApply.class)
.selectAll(CrmGiftApply.class)
.eq(CrmGiftApply::getDelFlag, "0")
.eq(StringUtils.isNotBlank(bo.getApplicationCode()), CrmGiftApply::getApplicationCode, bo.getApplicationCode())
.eq(bo.getApplicantId() != null, CrmGiftApply::getApplicantId, bo.getApplicantId())
.like(StringUtils.isNotBlank(bo.getApplicantName()), CrmGiftApply::getApplicantName, bo.getApplicantName())
.eq(bo.getApplicantDeptId() != null, CrmGiftApply::getApplicantDeptId, bo.getApplicantDeptId())
.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), CrmGiftApply::getApplicantDeptName, bo.getApplicantDeptName())
.eq(bo.getApplicationDate() != null, CrmGiftApply::getApplicationDate, bo.getApplicationDate())
.eq(bo.getCustomerUnitId() != null, CrmGiftApply::getCustomerUnitId, bo.getCustomerUnitId())
.like(StringUtils.isNotBlank(bo.getCustomerUnitName()), CrmGiftApply::getCustomerUnitName, bo.getCustomerUnitName())
.like(StringUtils.isNotBlank(bo.getGuestName()), CrmGiftApply::getGuestName, bo.getGuestName())
.eq(bo.getPeopleCount() != null, CrmGiftApply::getPeopleCount, bo.getPeopleCount())
.eq(StringUtils.isNotBlank(bo.getApplicationReason()), CrmGiftApply::getApplicationReason, bo.getApplicationReason())
.eq(bo.getRecipientId() != null, CrmGiftApply::getRecipientId, bo.getRecipientId())
.like(StringUtils.isNotBlank(bo.getRecipientName()), CrmGiftApply::getRecipientName, bo.getRecipientName())
.eq(bo.getRecipientDate() != null, CrmGiftApply::getRecipientDate, bo.getRecipientDate())
.eq(bo.getTotalAmount() != null, CrmGiftApply::getTotalAmount, bo.getTotalAmount())
.eq(StringUtils.isNotBlank(bo.getApplicationStatus()), CrmGiftApply::getApplicationStatus, bo.getApplicationStatus())
.eq(StringUtils.isNotBlank(bo.getFlowStatus()), CrmGiftApply::getFlowStatus, bo.getFlowStatus())
.orderByDesc(CrmGiftApply::getCreateTime);
.eq(StringUtils.isNotBlank(bo.getApplicationCode()), CrmGiftApply::getApplicationCode, bo.getApplicationCode())
.eq(bo.getApplicantId() != null, CrmGiftApply::getApplicantId, bo.getApplicantId())
.like(StringUtils.isNotBlank(bo.getApplicantName()), CrmGiftApply::getApplicantName, bo.getApplicantName())
.eq(bo.getApplicantDeptId() != null, CrmGiftApply::getApplicantDeptId, bo.getApplicantDeptId())
.like(StringUtils.isNotBlank(bo.getApplicantDeptName()), CrmGiftApply::getApplicantDeptName, bo.getApplicantDeptName())
.eq(bo.getApplicationDate() != null, CrmGiftApply::getApplicationDate, bo.getApplicationDate())
.eq(bo.getCustomerUnitId() != null, CrmGiftApply::getCustomerUnitId, bo.getCustomerUnitId())
.like(StringUtils.isNotBlank(bo.getCustomerUnitName()), CrmGiftApply::getCustomerUnitName, bo.getCustomerUnitName())
.like(StringUtils.isNotBlank(bo.getGuestName()), CrmGiftApply::getGuestName, bo.getGuestName())
.eq(bo.getPeopleCount() != null, CrmGiftApply::getPeopleCount, bo.getPeopleCount())
.eq(StringUtils.isNotBlank(bo.getApplicationReason()), CrmGiftApply::getApplicationReason, bo.getApplicationReason())
.eq(bo.getRecipientId() != null, CrmGiftApply::getRecipientId, bo.getRecipientId())
.like(StringUtils.isNotBlank(bo.getRecipientName()), CrmGiftApply::getRecipientName, bo.getRecipientName())
.eq(bo.getRecipientDate() != null, CrmGiftApply::getRecipientDate, bo.getRecipientDate())
.eq(bo.getTotalAmount() != null, CrmGiftApply::getTotalAmount, bo.getTotalAmount())
.eq(StringUtils.isNotBlank(bo.getApplicationStatus()), CrmGiftApply::getApplicationStatus, bo.getApplicationStatus())
.eq(StringUtils.isNotBlank(bo.getFlowStatus()), CrmGiftApply::getFlowStatus, bo.getFlowStatus())
.orderByDesc(CrmGiftApply::getCreateTime);
return lqw;
}
@ -162,6 +162,14 @@ public class CrmGiftApplyServiceImpl implements ICrmGiftApplyService {
// 保底：前端未传且无法获取则保持空，避免提交失败
}
}
// 补齐申请部门id（有些前端浏览器可能未带出）
if (add.getApplicantDeptId() == null) {
try {
add.setApplicantDeptId(LoginHelper.getLoginUser().getDeptId());
} catch (Exception ignored) {
// 保底：前端未传且无法获取则保持空，避免提交失败
}
}
// 新增时设置默认状态为草稿
if (StringUtils.isBlank(add.getApplicationStatus())) {
add.setApplicationStatus(OAStatusEnum.DRAFT.getStatus());

Write Preview
Loading…
Cancel
Save