邵洋 před 1 rokem
rodič
revize
257d3e62d7

+ 25 - 0
zksy-common/src/main/java/com/zksy/common/core/domain/model/RegisterBody.java

@@ -1,11 +1,36 @@
 package com.zksy.common.core.domain.model;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 /**
  * 用户注册对象
  * 
  * @author ruoyi
  */
+@Data
 public class RegisterBody extends LoginBody
 {
+    /**
+     * 用户类型
+     */
+    @ApiModelProperty(value = "用户类型")
+    private String userType;
+    /**
+     * 用户邮箱
+     */
+    @ApiModelProperty(value = "用户邮箱")
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "手机号码")
+    private String phonenumber;
 
+    /**
+     * 关联的角色id
+     */
+    @ApiModelProperty(value = "关联的角色id")
+    private Long[] roleIds;
 }

+ 8 - 0
zksy-framework/src/main/java/com/zksy/framework/web/service/SysRegisterService.java

@@ -14,6 +14,7 @@ import com.zksy.framework.manager.AsyncManager;
 import com.zksy.framework.manager.factory.AsyncFactory;
 import com.zksy.system.service.ISysConfigService;
 import com.zksy.system.service.ISysUserService;
+import com.zksy.system.service.impl.SysUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -28,6 +29,9 @@ public class SysRegisterService
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private SysUserServiceImpl sysUserServiceImpl;
+
     @Autowired
     private ISysConfigService configService;
 
@@ -83,6 +87,10 @@ public class SysRegisterService
             }
             else
             {
+                if(StringUtils.isNotNull(registerBody.getRoleIds())) {
+                    //插入用户角色关联
+                    sysUserServiceImpl.insertUserRole(sysUser.getUserId(), registerBody.getRoleIds());
+                }
                 AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER,
                         MessageUtils.message("user.register.success")));
             }