From 6923315545b3f97c86719148f85dac1220a14a63 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期三, 14 一月 2026 19:23:54 +0800
Subject: [PATCH] agv空托入库接口以及机器人组站点配置
---
src/main/java/com/zy/system/entity/User.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index f04af64..1ebf235 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.Department;
+import com.zy.asrs.service.DepartmentService;
import com.zy.system.service.HostService;
import com.zy.system.service.RoleService;
@@ -31,7 +33,6 @@
*/
@TableField("host_id")
private Long hostId;
-
/**
* 鎵�灞為儴闂�
@@ -76,7 +77,7 @@
private String email;
/**
- * 鎬у埆 0: 鐢� 1: 濂� 2: 鏈煡
+ * 鎬у埆 0: 鐢� 1: 濂� 2: 鏈煡
*/
private Integer sex;
@@ -87,7 +88,7 @@
private Date createTime;
/**
- * 鐘舵�� 1: 鍚敤 0: 绂佺敤
+ * 鐘舵�� 1: 鍚敤 0: 绂佺敤
*/
private Integer status;
@@ -125,11 +126,11 @@
}
public String getDeptName() {
-// DeptService service = SpringUtils.getBean(DeptService.class);
-// Dept dept = service.selectById(this.deptId);
-// if (!Cools.isEmpty(dept)){
-// return dept.getName();
-// }
+ DepartmentService service = SpringUtils.getBean(DepartmentService.class);
+ Department dept = service.selectById(this.deptId);
+ if (!Cools.isEmpty(dept)) {
+ return dept.getName();
+ }
return null;
}
@@ -258,6 +259,5 @@
public void setStatus(Integer status) {
this.status = status;
}
-
}
--
Gitblit v1.9.1