From 086a4c8baa1eb9cf8c08f71bad25ae9644966962 Mon Sep 17 00:00:00 2001
From: zhonghua1 <zhonghua1@example.com>
Date: Sat, 20 Dec 2025 22:58:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=80=E5=94=AE=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E5=88=9B=E5=BB=BA=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/rj/controller/SalesManagementController.java   | 6 ++++--
 src/main/java/com/rj/entity/DeviceManagement.java           | 5 +++++
 src/main/java/com/rj/entity/SalesManagement.java            | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/rj/controller/SalesManagementController.java b/src/main/java/com/rj/controller/SalesManagementController.java
index 85bfb53..f5d9c44 100644
--- a/src/main/java/com/rj/controller/SalesManagementController.java
+++ b/src/main/java/com/rj/controller/SalesManagementController.java
@@ -3,6 +3,7 @@ package com.rj.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.rj.common.DataEnrichmentUtil;
+import com.rj.common.PasswordUtil;
 import com.rj.entity.Dealership;
 import com.rj.entity.ProjectManagement;
 import com.rj.entity.SalesManagement;
@@ -105,11 +106,12 @@ public class SalesManagementController {
         
         // 创建用户对象
         User user = new User();
-        user.setUserId(salesManagement.getId().hashCode());
+//        user.setUserId(salesManagement.getId().hashCode());
         user.setUserName(phone); // 用户名 = 销售人员电话
         user.setPhone(phone);    // 电话号码 = 销售人员电话
-        user.setPassword(password); // 设置密码（UserController会自动加密）
+        user.setPassword(PasswordUtil.encryptPassword(salesManagement.getPassword())); // 设置密码（UserController会自动加密）
         user.setEmail(phone+"@YiDuoWang.com");
+        user.setTenantId(salesManagement.getTenantId());
         // 调用UserController的addUser方法保存用户
         ResponseEntity<Map<String, Object>> response = userController.addUser(user);
         
diff --git a/src/main/java/com/rj/entity/DeviceManagement.java b/src/main/java/com/rj/entity/DeviceManagement.java
index e03ee1a..582e3fe 100644
--- a/src/main/java/com/rj/entity/DeviceManagement.java
+++ b/src/main/java/com/rj/entity/DeviceManagement.java
@@ -114,6 +114,11 @@ public class DeviceManagement implements Serializable {
     @TableField("sales_phone")
     private String salesPhone;
 
+    @Schema(description = "登录密码")
+    @TableField("password")
+    private String password;
+
+
     @Schema(description = "创建时间")
     @TableField("create_time")
     private LocalDateTime createTime;
diff --git a/src/main/java/com/rj/entity/SalesManagement.java b/src/main/java/com/rj/entity/SalesManagement.java
index 9cbfeb5..b928820 100644
--- a/src/main/java/com/rj/entity/SalesManagement.java
+++ b/src/main/java/com/rj/entity/SalesManagement.java
@@ -98,5 +98,8 @@ public class SalesManagement implements Serializable {
     @TableField("update_time")
     private LocalDateTime updateTime;
 
+    @Schema(description = "密码（不存储在数据库中）")
+    @TableField(exist = false)
+    private String password;
 
 }