Commit f707c4379e5a4e3221590a574f2e13d9f62f8ac2

Authored by 曾国涛
1 parent ed463863

refactor(order): 优化项目锁定字段申请查询逻辑

- 在查询项目锁定字段申请时,增加了对 type 字段的非空判断- 使用 Objects.nonNull() 方法确保仅在 type 不为 null 时应用该查询条件
- 提高了查询的灵活性和准确性,避免了潜在的空指针异常
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
@@ -132,7 +132,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl<ProjectBaseInfoMappe @@ -132,7 +132,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl<ProjectBaseInfoMappe
132 public ServerResult pageProjectLockFieldApply(QueryProjectLockFieldVO vo) { 132 public ServerResult pageProjectLockFieldApply(QueryProjectLockFieldVO vo) {
133 Page<ProjectApplyDO> page = projectFieldLockApplyService.lambdaQuery() 133 Page<ProjectApplyDO> page = projectFieldLockApplyService.lambdaQuery()
134 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) 134 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
135 - .eq(ProjectApplyDO::getType, vo.getType()) 135 + .eq(Objects.nonNull(vo.getType()),ProjectApplyDO::getType, vo.getType())
136 .eq(ProjectApplyDO::getStatus, StringUtils.isBlank(vo.getStatus()) ? ApplyStatusEnum.WAIT_AUDIT.getStatus() : vo.getStatus()) 136 .eq(ProjectApplyDO::getStatus, StringUtils.isBlank(vo.getStatus()) ? ApplyStatusEnum.WAIT_AUDIT.getStatus() : vo.getStatus())
137 .orderByDesc(ProjectApplyDO::getCreateTime) 137 .orderByDesc(ProjectApplyDO::getCreateTime)
138 .page(new Page<>(vo.getPage(), vo.getPageSize())); 138 .page(new Page<>(vo.getPage(), vo.getPageSize()));