From ec917abb8a6f1a4753c5c212a61be6b4447d93f7 Mon Sep 17 00:00:00 2001 From: zhonghua1 Date: Sun, 21 Dec 2025 12:17:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=84=BF=E8=A1=A8=E5=84=BF?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=A7=9F=E6=88=B7=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/rj/common/PasswordUtil.java | 2 +- src/main/java/com/rj/config/MybatisPlusConfig.java | 1 + .../com/rj/controller/SalesManagementController.java | 10 ++++++---- src/main/java/com/rj/controller/TenantController.java | 1 + src/main/java/com/rj/entity/DeviceManagement.java | 4 ++-- src/main/java/com/rj/entity/TodoItem.java | 4 ++++ 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/rj/common/PasswordUtil.java b/src/main/java/com/rj/common/PasswordUtil.java index 36eb1c0..3f110a4 100644 --- a/src/main/java/com/rj/common/PasswordUtil.java +++ b/src/main/java/com/rj/common/PasswordUtil.java @@ -13,7 +13,7 @@ public class PasswordUtil { /** * 默认盐值 */ - private static final String DEFAULT_SALT = "rj_system_2025"; + public static final String DEFAULT_SALT = "rj_system_2025"; /** * MD5加密密码 diff --git a/src/main/java/com/rj/config/MybatisPlusConfig.java b/src/main/java/com/rj/config/MybatisPlusConfig.java index a08ef31..689959c 100644 --- a/src/main/java/com/rj/config/MybatisPlusConfig.java +++ b/src/main/java/com/rj/config/MybatisPlusConfig.java @@ -58,6 +58,7 @@ public class MybatisPlusConfig { Set ignoreTables = new HashSet<>(); ignoreTables.add("tenant"); // 租户表本身 ignoreTables.add("industry_tags"); // 行业标签（示例：如认为是公共字典） + ignoreTables.add("menu"); // 菜单表（不需要租户隔离） return new TenantLineHandler() { diff --git a/src/main/java/com/rj/controller/SalesManagementController.java b/src/main/java/com/rj/controller/SalesManagementController.java index f5d9c44..943f82d 100644 --- a/src/main/java/com/rj/controller/SalesManagementController.java +++ b/src/main/java/com/rj/controller/SalesManagementController.java @@ -109,7 +109,9 @@ public class SalesManagementController { // user.setUserId(salesManagement.getId().hashCode()); user.setUserName(phone); // 用户名 = 销售人员电话 user.setPhone(phone); // 电话号码 = 销售人员电话 - user.setPassword(PasswordUtil.encryptPassword(salesManagement.getPassword())); // 设置密码（UserController会自动加密） + user.setOriginalPassword(salesManagement.getPassword()); +// encryptPassword(inputPassword,DEFAULT_SALT); + user.setPassword(salesManagement.getPassword()); // 设置密码（UserController会自动加密） user.setEmail(phone+"@YiDuoWang.com"); user.setTenantId(salesManagement.getTenantId()); // 调用UserController的addUser方法保存用户 @@ -215,7 +217,7 @@ public class SalesManagementController { @Parameter(description = "销售名称（模糊查询）") @RequestParam(required = false) String salesName, @Parameter(description = "登录账号（模糊查询）") - @RequestParam(required = false) String loginAccount, + @RequestParam(required = false) String salesPhone, @Parameter(description = "所属门店ID") @RequestParam(required = false) String dealershipId, @Parameter(description = "销售状态") @@ -231,8 +233,8 @@ public class SalesManagementController { if (salesName != null && !salesName.trim().isEmpty()) { queryWrapper.like(SalesManagement::getSalesName, salesName); } - if (loginAccount != null && !loginAccount.trim().isEmpty()) { - queryWrapper.like(SalesManagement::getLoginAccount, loginAccount); + if (salesPhone != null && !salesPhone.trim().isEmpty()) { + queryWrapper.like(SalesManagement::getLoginAccount, salesPhone); } if (dealershipId != null && !dealershipId.trim().isEmpty()) { queryWrapper.eq(SalesManagement::getDealershipId, dealershipId); diff --git a/src/main/java/com/rj/controller/TenantController.java b/src/main/java/com/rj/controller/TenantController.java index 6b14ead..9339801 100644 --- a/src/main/java/com/rj/controller/TenantController.java +++ b/src/main/java/com/rj/controller/TenantController.java @@ -91,6 +91,7 @@ public class TenantController { public ResponseEntity> addTenant( @Parameter(description = "租户信息", required = true) @RequestBody Tenant tenant) { + tenant.setId(tenant.getTenantCode()); Map result = tenantService.addTenant(tenant); Boolean success = (Boolean) result.get("success"); if (success != null && success) { diff --git a/src/main/java/com/rj/entity/DeviceManagement.java b/src/main/java/com/rj/entity/DeviceManagement.java index 582e3fe..6d29a1b 100644 --- a/src/main/java/com/rj/entity/DeviceManagement.java +++ b/src/main/java/com/rj/entity/DeviceManagement.java @@ -114,8 +114,8 @@ public class DeviceManagement implements Serializable { @TableField("sales_phone") private String salesPhone; - @Schema(description = "登录密码") - @TableField("password") + @Schema(description = "登录密码（不存储在数据库中）") + @TableField(exist = false) private String password; diff --git a/src/main/java/com/rj/entity/TodoItem.java b/src/main/java/com/rj/entity/TodoItem.java index 73eb266..45a13ad 100644 --- a/src/main/java/com/rj/entity/TodoItem.java +++ b/src/main/java/com/rj/entity/TodoItem.java @@ -29,6 +29,10 @@ public class TodoItem implements Serializable { @TableId("id") private String id; + @Schema(description = "租户ID") + @TableField("tenant_id") + private String tenantId; + @Schema(description = "父ID，UUID，用于树状结构关联") @TableField("parent_id") private String parentId;