admin/smartDriveEE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

菜单儿表儿不需要租户相关

Browse Source
This commit is contained in:
zhonghua1
2025-12-21 12:17:01 +08:00
parent 086a4c8baa
commit ec917abb8a
6 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/rj/common/PasswordUtil.java
View File

@@ -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加密密码

1
src/main/java/com/rj/config/MybatisPlusConfig.java
View File

@@ -58,6 +58,7 @@ public class MybatisPlusConfig {
Set<String> ignoreTables = new HashSet<>();
ignoreTables.add("tenant"); // 租户表本身
ignoreTables.add("industry_tags"); // 行业标签（示例：如认为是公共字典）
ignoreTables.add("menu"); // 菜单表（不需要租户隔离）
return new TenantLineHandler() {

10
src/main/java/com/rj/controller/SalesManagementController.java
View File

@@ -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);

1
src/main/java/com/rj/controller/TenantController.java
View File

@@ -91,6 +91,7 @@ public class TenantController {
public ResponseEntity<Map<String, Object>> addTenant(
@Parameter(description = "租户信息", required = true)
@RequestBody Tenant tenant) {
tenant.setId(tenant.getTenantCode());
Map<String, Object> result = tenantService.addTenant(tenant);
Boolean success = (Boolean) result.get("success");
if (success != null && success) {

4
src/main/java/com/rj/entity/DeviceManagement.java
View File

@@ -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;

4
src/main/java/com/rj/entity/TodoItem.java
View File

@@ -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;