From 80e22bcc7af8aebed7443965655542fbe4966708 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 09 四月 2025 15:11:55 +0800
Subject: [PATCH] 灌溉计划删除,所有命令发布都失败依然允许终止

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java |   69 ++++++++++------------------------
 1 files changed, 21 insertions(+), 48 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 4ee99ec..5e3341f 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
@@ -1,55 +1,28 @@
 package com.dy.pipIrrGlobal.util;
 
-
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.EnumValue;
-
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
-public enum Org {
-
-    Ym("ym", "鍏冭皨"),
-    Pj("pj", "鐗囪闀�") ;
-
-    @EnumValue
-    public String tag ;
-    public String name ;
-
-    Org(String tag, String name){
-        this.tag = tag ;
-        this.name = name ;
-    }
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/24 11:45
+ * @Description
+ */
+public class Org {
     //鐢ㄦ潵杞琷son
-    public static Map<String, Org> ObjMap = new HashMap<String, Org>();
-    static {
-        Org[] all = Org.values();
-        for (Org one : all) {
-            ObjMap.put(one.tag, one);
+    public static List<OrgVo> OrgList = new ArrayList<>();
+
+    public class OrgVo{
+        public String tag ;
+        public String name ;
+
+        public String getTag() {
+            return this.tag ;
+        }
+
+        public String getName() {
+            return this.name ;
         }
     }
-
-    public String getTag() {
-        return this.tag ;
-    }
-
-    public String getName() {
-        return this.name ;
-    }
-
-    public static Org get(String tag){
-        if(tag.equals(Ym.tag)){
-            return Ym ;
-        }else if(tag.equals(Pj.tag)){
-            return Pj ;
-        }
-        return null ;
-    }
-
-
-    @JSONField
-    public JSONObject toJson() {
-        return JSONObject.of("tag", getTag(), "name", getName());
-    }
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0