From a860a554680453f533328858a525e663a22e86ed Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 31 Oct 2023 10:20:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb20231030
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 4d0afd5..6716882 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -748,6 +748,8 @@
integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
integerList.add(AllocationApproveEnum.DRAFT.value);
+ }else if(type.equals(2)){
+ integerList.add(0);
}
}
if(type.equals(3)){
--
Gitblit v1.8.0