diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java index daecb125..909bc4fe 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java @@ -12,9 +12,8 @@ public enum LeaseTaskStatusEnum { LEASE_TASK_TO_PUBLISHED(1, "待发布"), LEASE_TASK_TO_AUDIT(2, "待审核"), - LEASE_TASK_TO_STOCK_OUT(3, "待出库"), - LEASE_TASK_IN_STOCK_OUT(4, "出库进行中"), - LEASE_TASK_END_STOCK_OUT(5, "出库已完成"); + LEASE_TASK_IN_STOCK_OUT(3, "出库进行中"), + LEASE_TASK_END_STOCK_OUT(4, "出库已完成"); private final Integer status; private final String statusName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java index 769ac569..2424a0c9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java @@ -306,6 +306,8 @@ public class SelectServiceImpl implements SelectService { List list = mapper.getAgreementInfoById(dto); if (CollectionUtils.isNotEmpty(list)) { vo = list.get(0); + } else { + return AjaxResult.error("未找到匹配的协议信息"); } } catch (Exception e) { log.error("往来单位id和标段工程id获取协议信息", e);