From a7e9adf02ad433d3734e85b1358b5c9ce883b1df Mon Sep 17 00:00:00 2001
From: chengyufei <1932574737@qq.com>
Date: Fri, 14 Jul 2023 09:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=BB=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taskType/controller/TaskTypeController.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskType/controller/TaskTypeController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskType/controller/TaskTypeController.java
index 6e0c99c..a5eb58f 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskType/controller/TaskTypeController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskType/controller/TaskTypeController.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javafx.util.Pair;
@@ -42,6 +44,9 @@ public class TaskTypeController extends JeecgController<TaskType, ITaskTypeServi
     @Autowired
     private ITaskTypeService taskTypeService;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
     private static final String ADMIN_COLUMN_KEY = "99";
 
     /**
@@ -50,7 +55,7 @@ public class TaskTypeController extends JeecgController<TaskType, ITaskTypeServi
      */
     @GetMapping("/getTypeMap")
     public Result<?> getMapType(){
-        Map<TypeDto, List<TypeDto>> listMap = new HashMap<>();
+        Map<String, List<TypeDto>> listMap = new HashMap<>();
 
         List<TaskType> hasChild = taskTypeService.query().eq("has_child", "1").list();
         if (hasChild == null || hasChild.size() == 0)
@@ -68,7 +73,15 @@ public class TaskTypeController extends JeecgController<TaskType, ITaskTypeServi
             for (TaskType type : list)
                 typeDtoList.add(new TypeDto(type.getId(), type.getTypeName()));
             //放入数据到map
-            listMap.put(typeDto, typeDtoList);
+
+            String key = null;
+            try {
+                key = objectMapper.writeValueAsString(typeDto);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+
+            listMap.put(key, typeDtoList);
         }
         return Result.OK(listMap);
     }