From 8fb7d34f52c2d885ed169590b073b9b819a05f86 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 27 十一月 2023 19:54:31 +0800
Subject: [PATCH] 修改枚举类型转json问题

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Org.java           |    9 +++++++--
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java |   10 ++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
index bd55fd8..29a674b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
@@ -1,9 +1,12 @@
 package com.dy.pipIrrGlobal.util;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.dy.common.mybatis.envm.IEnum;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,11 +31,14 @@
     }
 
     //鐢ㄦ潵杞琷son
-    public static Map<Byte, String> ObjMap = new HashMap<>();
+    public static List<Map> LevelList = new ArrayList<>();
     static {
         DistrictLevel[] all = DistrictLevel.values();
         for (DistrictLevel one : all) {
-            ObjMap.put(one.code, one.name);
+            Map<String, Object> objMap = new HashMap<>();
+            objMap.put("code", one.code);
+            objMap.put("name", one.name);
+            LevelList.add(objMap) ;
         }
     }
 
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..0507bd1 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,7 +5,9 @@
 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 {
@@ -22,11 +24,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) ;
         }
     }
 

--
Gitblit v1.8.0