From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 11:28:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java
index 852affa..bfee95f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dept.java
@@ -1,9 +1,6 @@
package com.zy.asrs.wcs.system.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.system.service.HostService;
@@ -15,6 +12,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("sys_dept")
@@ -152,6 +150,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @TableField(exist = false)
+ private List<Dept> children;
+
public Dept() {}
public Dept(String name,Long parentId,String parentName,String path,String pathName,String fullName,String brief,String code,Integer type,String leader,Integer count,Integer sort,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
@@ -244,7 +245,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
@@ -260,9 +261,10 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
+
}
--
Gitblit v1.9.1