From 0c5606be951e50c6e86671ecde51b012f5d55735 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 18 六月 2024 14:32:26 +0800
Subject: [PATCH] 2024-06-18 朱宝民 开关阀报(未完)

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
index c75ff11..70a0885 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java
@@ -5,13 +5,16 @@
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.EnumValue;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public enum Org {
 
-    Ym("ym", "鍏冭皨"),
-    Pj("pj", "鐗囪闀�") ;
+//    Ym("ym", "鍏冭皨"),
+//    Pj("pj", "鐗囪闀�"),
+    Jyg("ym", "鍢夊唱鍏�");
 
     @EnumValue
     public String tag ;
@@ -22,11 +25,14 @@
         this.name = name ;
     }
     //鐢ㄦ潵杞琷son
-    public static Map<String, String> ObjMap = new HashMap<>();
+    public static List<Map> OrgList = new ArrayList<>();
     static {
         Org[] all = Org.values();
         for (Org one : all) {
-            ObjMap.put(one.tag, one.name);
+            Map<String, String> objMap = new HashMap<>();
+            objMap.put("tag", one.tag);
+            objMap.put("name", one.name);
+            OrgList.add(objMap) ;
         }
     }
 
@@ -39,10 +45,13 @@
     }
 
     public static Org get(String tag){
-        if(tag.equals(Ym.tag)){
-            return Ym ;
-        }else if(tag.equals(Pj.tag)){
-            return Pj ;
+//        if(tag.equals(Ym.tag) || tag.equals(Jyg.tag)){
+//            return Ym ;
+//        }else if(tag.equals(Pj.tag)){
+//            return Pj ;
+//        }
+        if( tag.equals(Jyg.tag)){
+            return Jyg ;
         }
         return null ;
     }

--
Gitblit v1.8.0