From f926cad86abceac143887ab28724d9eefb974768 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Thu, 7 Nov 2024 09:31:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?mainOut.ts=20=E4=BF=AE=E6=94=B9=2011.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecgboot-vue3/src/router/helper/mainOut.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeecgboot-vue3/src/router/helper/mainOut.ts b/jeecgboot-vue3/src/router/helper/mainOut.ts
index c4e8005..190f34b 100644
--- a/jeecgboot-vue3/src/router/helper/mainOut.ts
+++ b/jeecgboot-vue3/src/router/helper/mainOut.ts
@@ -67,7 +67,7 @@ export const mainOutRoutes: AppRouteModule[] = [
       {
         path: '/main-home/newsList',
         name: 'NewsList',
-        component: () => import('/@/views/demo/main-home/components/newsList/index.vue'),
+        component: () => import('/@/views/demo/main-home/components/NewsList/index.vue'),
         meta: {
           title: '新闻列表',
           ignoreAuth: true,
@@ -76,7 +76,7 @@ export const mainOutRoutes: AppRouteModule[] = [
       {
         path: '/main-home/newsInfo',
         name: 'NewsIndo',
-        component: () => import('/@/views/demo/main-home/components/newsInFo/index.vue'),
+        component: () => import('/@/views/demo/main-home/components/newsInfo/index.vue'),
         meta: {
           title: '新闻详情',
           ignoreAuth: true,

From b9600b6872245de0136280e23b738bd961b712ec Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 7 Nov 2024 09:42:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=AA=E5=99=A8BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/instrument/controller/InstrumentController.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 51eafb8..b17c65c 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
@@ -390,8 +390,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");

From d5331b0cf5b4b093161d22a99be48c0275789a44 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 7 Nov 2024 10:25:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=AA=E5=99=A8BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecgboot-vue3/src/views/instrument/InstrumentList2.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jeecgboot-vue3/src/views/instrument/InstrumentList2.vue b/jeecgboot-vue3/src/views/instrument/InstrumentList2.vue
index 5dfa4c7..b2078a7 100644
--- a/jeecgboot-vue3/src/views/instrument/InstrumentList2.vue
+++ b/jeecgboot-vue3/src/views/instrument/InstrumentList2.vue
@@ -250,6 +250,7 @@
    * 操作栏
    */
   function getTableAction(record) {
+    const oct = userStore.loginInfo.departs[0].orgCategory;
     const actions = [
       {
         label: '详情',
@@ -257,7 +258,7 @@
       }
     ];
 
-    if(record.state==="1"||record.state==="2"){
+    if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){
       actions.unshift({
         label: '通过',
         popConfirm: {
@@ -266,7 +267,7 @@
         }
       });
     }
-    if(record.state==="1"||record.state==="2"){
+    if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){
       actions.unshift({
         label: '驳回',
         popConfirm: {