From afeeed281e60466b576fbe74d339634cc5d07b82 Mon Sep 17 00:00:00 2001
From: Codex Assistant <codex@example.com>
Date: 星期三, 08 十月 2025 08:56:42 +0800
Subject: [PATCH] 修复评审功能和用户认证问题
---
backend/src/main/java/com/rongyichuang/employee/dto/response/EmployeeResponse.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/backend/src/main/java/com/rongyichuang/employee/dto/response/EmployeeResponse.java b/backend/src/main/java/com/rongyichuang/employee/dto/response/EmployeeResponse.java
index 27a88e5..e79257c 100644
--- a/backend/src/main/java/com/rongyichuang/employee/dto/response/EmployeeResponse.java
+++ b/backend/src/main/java/com/rongyichuang/employee/dto/response/EmployeeResponse.java
@@ -1,6 +1,7 @@
package com.rongyichuang.employee.dto.response;
import com.rongyichuang.employee.entity.Employee;
+import com.rongyichuang.user.entity.User;
/**
* 鍛樺伐鍝嶅簲DTO
@@ -11,18 +12,38 @@
private String phone;
private String roleId;
private String description;
+ private Integer state;
private String createTime;
private String updateTime;
// 鏋勯�犲嚱鏁�
public EmployeeResponse() {}
+ /**
+ * @deprecated 姝ゆ瀯閫犲嚱鏁板凡搴熷純锛岃浣跨敤 EmployeeResponse(Employee, User) 鏋勯�犲嚱鏁�
+ */
+ @Deprecated
public EmployeeResponse(Employee employee) {
this.id = employee.getId();
this.name = employee.getName();
- this.phone = employee.getPhone();
+ this.phone = employee.getPhone(); // 杩欓噷浼氳繑鍥瀗ull锛屽洜涓簆hone瀛楁宸插簾寮�
this.roleId = employee.getRoleId();
this.description = employee.getDescription();
+ this.state = employee.getState();
+ this.createTime = employee.getCreateTime() != null ? employee.getCreateTime().toString() : null;
+ this.updateTime = employee.getUpdateTime() != null ? employee.getUpdateTime().toString() : null;
+ }
+
+ /**
+ * 鎺ㄨ崘浣跨敤鐨勬瀯閫犲嚱鏁帮紝浠嶶ser瀵硅薄鑾峰彇phone淇℃伅
+ */
+ public EmployeeResponse(Employee employee, User user) {
+ this.id = employee.getId();
+ this.name = employee.getName();
+ this.phone = user != null ? user.getPhone() : null; // 浠嶶ser瀵硅薄鑾峰彇phone
+ this.roleId = employee.getRoleId();
+ this.description = employee.getDescription();
+ this.state = employee.getState();
this.createTime = employee.getCreateTime() != null ? employee.getCreateTime().toString() : null;
this.updateTime = employee.getUpdateTime() != null ? employee.getUpdateTime().toString() : null;
}
@@ -68,6 +89,14 @@
this.description = description;
}
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
public String getCreateTime() {
return createTime;
}
--
Gitblit v1.8.0