From fb0c38c7470122174c0088fa8f2f69a0a90e2994 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 02 二月 2024 17:35:54 +0800
Subject: [PATCH] 1
---
ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java | 2 +-
ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java | 3 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 4 +++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 21550e1..e00a6a5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner;
+import com.ltkj.common.core.domain.TreeSelect;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.SecurityUtils;
@@ -1387,7 +1388,8 @@
@GetMapping("/deptTree111")
@ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
public AjaxResult deptTree111(SysDept dept) {
- return success(deptService.selectDeptTreeList1(dept));
+ final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
+ return success(treeSelects);
}
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java
index 06c6ff9..37e7bb0 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/TreeSelect.java
@@ -21,7 +21,7 @@
/**
* 鑺傜偣ID
*/
-// @JsonSerialize(using = ToStringSerializer.class)
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
index dae0d4c..010104c 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
@@ -10,6 +10,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ltkj.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -35,6 +37,7 @@
* 閮ㄩ棬ID
*/
@TableId
+ @JsonSerialize(using = ToStringSerializer.class)
private Long deptId;
/**
--
Gitblit v1.8.0