From cbdb9ea8d17e07dda2362d1c61e867afe8395ef2 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 18:17:42 +0800
Subject: [PATCH] Merge branch 'cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 3 ---
1 files changed, 0 insertions(+), 3 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 2c4a3cb..003041c 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
@@ -157,9 +157,6 @@
if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&& escalationType(allocationUpdateCond.getEscalationUnitId())) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
- if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&&allocationUpdateCond.getEscalationUnitId().toString().length()==6) {
- allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
- }
if(NEW_BUILT.equals(allocationUpdateCond.getState())) {
//������������������
ApproveTable approveTable = new ApproveTable();
--
Gitblit v1.8.0