From 48f7dda15bd18ba86b881fd17fd361ba1024d8c5 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 7 Nov 2024 09:49:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E6=96=B0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/InnovationVoucherController.java                | 3 +--
 .../demo/instrument/controller/InstrumentController.java       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java
index dc30526..ca5b2ef 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java
@@ -491,8 +491,7 @@ public class InnovationVoucherController extends JeecgController<InnovationVouch
 		 if(innovationVoucher.getFlag().equals("1")){
 			 innovationVoucher.setState("2");
 			 innovationVoucher.setFlag("2");
-		 }
-		 if(innovationVoucher.getFlag().equals("2")&&innovationVoucher.getState().equals("2")){
+		 }else if(innovationVoucher.getFlag().equals("2")&&innovationVoucher.getState().equals("2")){
 			 innovationVoucher.setState("3");
 		 }
 		 //instrument.setFlag("2");
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
index ee2c50d..f636456 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
@@ -349,8 +349,7 @@ public class InstrumentController extends JeecgController<Instrument, IInstrumen
 		 if(instrument.getFlag().equals("1")){
 			 instrument.setState("2");
 			 instrument.setFlag("2");
-		 }
-		 if(instrument.getFlag().equals("2")&&instrument.getState().equals("2")){
+		 }else if(instrument.getFlag().equals("2")&&instrument.getState().equals("2")){
 			 instrument.setState("3");
 		 }
 		 //instrument.setFlag("2");