From 13372326c0064469d8621750024151c03447c350 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Tue, 3 Dec 2024 17:03:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B6=88=E6=81=AF=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B8=8E=E9=83=A8=E9=97=A8=E6=A8=A1=E5=9D=97):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E6=B6=88=E6=81=AF=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?bug=E5=B9=B6=E4=BB=8E=E6=96=B0=E5=BB=BA=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=AD=E7=8B=AC=E7=AB=8B=E5=87=BA=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=99=84=E4=BB=B6=E6=8E=A5=E5=8F=A3=EF=BC=8C=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=A8=A1=E5=9D=97=E6=96=B0=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=A0=91=E8=BF=94=E5=9B=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{framework => common/util}/TreeUtil.java | 2 +- .../gateway/framework/JsonExceptionUtil.java | 21 -------------- .../gateway/modules/system/entity/Dept.java | 6 +++- .../system/service/impl/DeptServiceImpl.java | 2 +- .../mappers/systemMappers/DeptMapper.xml | 28 ++++++------------- 5 files changed, 16 insertions(+), 43 deletions(-) rename src/main/java/com/zsc/edu/gateway/{framework => common/util}/TreeUtil.java (99%) delete mode 100644 src/main/java/com/zsc/edu/gateway/framework/JsonExceptionUtil.java diff --git a/src/main/java/com/zsc/edu/gateway/framework/TreeUtil.java b/src/main/java/com/zsc/edu/gateway/common/util/TreeUtil.java similarity index 99% rename from src/main/java/com/zsc/edu/gateway/framework/TreeUtil.java rename to src/main/java/com/zsc/edu/gateway/common/util/TreeUtil.java index 2fb31cb..312f984 100644 --- a/src/main/java/com/zsc/edu/gateway/framework/TreeUtil.java +++ b/src/main/java/com/zsc/edu/gateway/common/util/TreeUtil.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.framework; +package com.zsc.edu.gateway.common.util; import java.util.*; import java.util.function.*; diff --git a/src/main/java/com/zsc/edu/gateway/framework/JsonExceptionUtil.java b/src/main/java/com/zsc/edu/gateway/framework/JsonExceptionUtil.java deleted file mode 100644 index 2bb5042..0000000 --- a/src/main/java/com/zsc/edu/gateway/framework/JsonExceptionUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zsc.edu.gateway.framework; - -import org.springframework.http.HttpStatus; - -import java.util.Calendar; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * @author harry yao - */ -public class JsonExceptionUtil { - public static Map jsonExceptionResult(HttpStatus code, String message, String path) { - Map exceptionMap = new LinkedHashMap<>(); - exceptionMap.put("timestamp", Calendar.getInstance().getTime()); - exceptionMap.put("message", message); - exceptionMap.put("path", path); - exceptionMap.put("code", code.value()); - return exceptionMap; - } -} diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/entity/Dept.java b/src/main/java/com/zsc/edu/gateway/modules/system/entity/Dept.java index af06bd7..eee7b9b 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/entity/Dept.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/entity/Dept.java @@ -2,6 +2,7 @@ package com.zsc.edu.gateway.modules.system.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.zsc.edu.gateway.modules.system.vo.UserVo; import lombok.Getter; import lombok.Setter; @@ -47,6 +48,9 @@ public class Dept extends BaseEntity { private Boolean enabled = true; @TableField(exist = false) - public List children = new ArrayList<>(0); + public List children = null; + + @TableField(exist = false) + public List members = null; } diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java index ec09102..444f70a 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java @@ -2,7 +2,7 @@ package com.zsc.edu.gateway.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zsc.edu.gateway.exception.ConstraintException; -import com.zsc.edu.gateway.framework.TreeUtil; +import com.zsc.edu.gateway.common.util.TreeUtil; import com.zsc.edu.gateway.modules.system.dto.DeptDto; import com.zsc.edu.gateway.modules.system.entity.Dept; import com.zsc.edu.gateway.modules.system.mapper.DeptMapper; diff --git a/src/main/resources/mappers/systemMappers/DeptMapper.xml b/src/main/resources/mappers/systemMappers/DeptMapper.xml index 63f120d..adb3b3f 100644 --- a/src/main/resources/mappers/systemMappers/DeptMapper.xml +++ b/src/main/resources/mappers/systemMappers/DeptMapper.xml @@ -8,30 +8,20 @@ - - - - - - - - - - - - - - - - - - + + + + + + +