fix bug 并网管理端工程审核阻塞

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -217,11 +217,6 @@ public class BasicGridAcceptanceServiceImpl
 			BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
 			String beforeAcceptanceStatus = basicGridAcceptanc.getAcceptanceStatus();
 			String nextNodeKey = basicGridAcceptanc.getNextNodeKey();
-			AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey, dto.getApprovalStatus());
-			if (acceptanceStatus == null) {
-				// 说明工作流节点状态执行错误
-				throw new BadRequest("其他用户正在操作，请刷新后再试！");
-			}
 			if (OK.equals(dto.getApprovalStatus())) {
 				if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
 					basicGridAcceptanc.setGridStatus(GridStatusEnum.YWC.getCode());
@@ -239,7 +234,11 @@ public class BasicGridAcceptanceServiceImpl
 					peasantHouseholdMapper.update(null, up);
 
 				} else {
-
+					AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey, dto.getApprovalStatus());
+					if (acceptanceStatus == null) {
+						// 说明工作流节点状态执行错误
+						throw new BadRequest("其他用户正在操作，请刷新后再试！");
+					}
 					basicGridAcceptanc
 							.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 				}
@@ -274,6 +273,11 @@ public class BasicGridAcceptanceServiceImpl
 					basicGridAcceptanc
 							.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 				} else {
+					AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey, dto.getApprovalStatus());
+					if (acceptanceStatus == null) {
+						// 说明工作流节点状态执行错误
+						throw new BadRequest("其他用户正在操作，请刷新后再试！");
+					}
 					basicGridAcceptanc
 							.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 				}