Gqingci 4 日 前
コミット
9eaad4ae4c

+ 1 - 0
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/MainCompanyApply.java

@@ -29,6 +29,7 @@ public class MainCompanyApply extends BaseEntity {
     private String surname;
     private String name;
     private String mobile;
+    private String password;
     private BigDecimal latitude;
     private BigDecimal longitude;
     private Integer applyStatus;

+ 5 - 0
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/bo/MainCompanyApplyBo.java

@@ -57,6 +57,11 @@ public class MainCompanyApplyBo extends BaseEntity {
     @NotBlank(message = "手机号不能为空", groups = {AddGroup.class, EditGroup.class})
     @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
     private String mobile;
+
+    @NotBlank(message = "密码不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 5, max = 30, message = "密码长度必须在5到30个字符之间")
+    private String password;
+
     private BigDecimal latitude;
     private BigDecimal longitude;
     private Integer applyStatus;

+ 1 - 1
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/MainAuditServiceImpl.java

@@ -174,7 +174,7 @@ public class MainAuditServiceImpl implements IMainAuditService {
 
         // 必需字段:创建系统用户的用户名和密码
         tenantBo.setUsername(companyApply.getMobile()); // 使用手机号作为用户名
-        tenantBo.setPassword("666666"); // 设置默认密码
+        tenantBo.setPassword(companyApply.getPassword());
         tenantBo.setEmail(companyApply.getOfficialAccount()); // 设置邮箱
 
         // 4. 创建租户

+ 1 - 0
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/MainCompanyApplyServiceImpl.java

@@ -135,6 +135,7 @@ public class MainCompanyApplyServiceImpl implements IMainCompanyApplyService {
         apply.setSurname(bo.getSurname());
         apply.setName(bo.getName());
         apply.setMobile(bo.getMobile());
+        apply.setPassword(bo.getPassword());
         apply.setApplyStatus(0);
         apply.setAuthLetter(parseFirstOssId(bo.getAuthLetter()));
         apply.setAvatar(parseFirstOssId(bo.getAvatar()));

+ 1 - 0
script/sql/main.sql

@@ -151,6 +151,7 @@ CREATE TABLE `main_company_apply` (
   `surname` varchar(50) DEFAULT NULL COMMENT '联系人姓',
   `name` varchar(50) DEFAULT NULL COMMENT '联系人名',
   `mobile` varchar(20) DEFAULT NULL COMMENT '联系电话',
+  `password` varchar(100) DEFAULT NULL COMMENT '登录密码',
   `apply_status` tinyint DEFAULT '0' COMMENT '申请状态(0待审核 1已通过 2已驳回)',
   `audit_id` bigint DEFAULT NULL COMMENT '审核ID',
   `tenant_id` varchar(64) DEFAULT NULL COMMENT '租户ID',