bug ： 5139

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanAuditServiceImpl.java

@@ -27,6 +27,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Service("planAuditService")
 public class PlanAuditServiceImpl implements IPlanAuditService {
@@ -61,7 +62,8 @@ public class PlanAuditServiceImpl implements IPlanAuditService {
             Map<String, Object> taskAuthMap = workflowExcuteService.checkTaskAuthMap(instanceId, reginParams);
             if (taskAuthMap != null && !taskAuthMap.isEmpty()) {
                 // 获取当前计划
-                Plan plan = planDao.getOne(planAuditLog.getPlanId());
+                Optional<Plan> planEntity = planDao.findById(planAuditLog.getPlanId());
+                Plan  plan =  planEntity.get();
                 String taskId = taskAuthMap.get("taskId") == null ? null : taskAuthMap.get("taskId").toString();
                 String name = taskAuthMap.get("name") == null ? null : taskAuthMap.get("name").toString();
                 String roleName = reginParams.getRole().getRoleName();
@@ -139,7 +141,7 @@ public class PlanAuditServiceImpl implements IPlanAuditService {
                     workflowExcuteService.setTaskAssign(instanceId, checkLeaderId);
                 }
                 int status = statusEnum != null ? statusEnum.getNextStatus() : PlanStatusEnum.DRAFT.getValue();
-                if (nextCondition.equals(conditionValue) && PlanStatusEnum.EXAMINE_THREE.getValue() == status) {
+                if (nextCondition.equals(conditionValue) && PlanStatusEnum.EXAMINE_THREE.getNextStatus() == status) {
                     status = PlanStatusEnum.IN_EXECUTION.getValue();
                 }
                 planDao.updatePlanStatus(status, plan.getId());