Merge remote-tracking branch 'origin/master'

fightwine-common/src/main/java/com/yzt/common/request/UserEditRequest.java

@@ -27,6 +27,9 @@ public class UserEditRequest implements Serializable {
     @Length(max = 255, message = "用户昵称不能超过255个字符")
     private String nickname;
 
+    @ApiModelProperty("用户公司名称")
+    private String companyName;
+
     @ApiModelProperty(value = "用户头像")
     @NotBlank(message = "请上传用户头像")
     @Length(max = 255, message = "用户头像不能超过255个字符")
@@ -42,4 +45,6 @@ public class UserEditRequest implements Serializable {
 
     @ApiModelProperty(value = "性别")
     private Integer sex;
+
+
 }

fightwine-common/src/main/java/com/yzt/common/response/UserCenterResponse.java

@@ -96,7 +96,7 @@ public class UserCenterResponse implements Serializable {
 
     @ApiModelProperty(value = "公司名称")
     private String tenantName;
-    @ApiModelProperty(value = "租户名称")
+    @ApiModelProperty(value = "租户id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long tenantId;
 

fightwine-common/src/main/java/com/yzt/common/response/UserResponse.java

@@ -1,5 +1,6 @@
 package com.yzt.common.response;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,6 +26,10 @@ public class UserResponse {
     @JsonIgnore
     private String pwd;
 
+    @ApiModelProperty(value = "租户名称")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long tenantId;
+
     @ApiModelProperty(value = "真实姓名")
     private String realName;
 

fightwine-service/src/main/java/com/yzt/service/service/impl/TenantServiceImpl.java

@@ -53,6 +53,9 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
     @Autowired
     private SystemAttachmentService systemAttachmentService;
 
+    @Autowired
+    private SystemConfigService systemConfigService;
+
     @Autowired
     private QrCodeService qrCodeService;
 
@@ -68,7 +71,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
             tenant.setCreatedTime(YztDateUtil.nowDateTime());
             tenant.setCreatedBy(SecurityUtil.getLoginUserVo().getUser().getId());
         }
-        if(tenant.getRegisterQrCodeUrl().isBlank()){
+        if(ObjectUtil.isNull(tenant.getRegisterQrCodeUrl())){
             tenant.setRegisterQrCodeUrl(generateRegisterUrl());
         }
         tenant.setUpdatedTime(YztDateUtil.nowDateTime());
@@ -176,7 +179,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
 
     @Override
     public String generateRegisterUrl() {
-        return systemAttachmentService.getCdnUrl()+"/#/pages/register/register?tenantId=" + SecurityUtil.getLoginUserVo().getUser().getTenantId();
+        return systemConfigService.getValueByKey("register_qr_code_url")+"/#/pages/register/register?tenantId=" + SecurityUtil.getLoginUserVo().getUser().getTenantId();
     }
 
     private void checkNameExist(TenantSaveRequest req) {

fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java

@@ -1911,6 +1911,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         user.setBirthday(request.getBirthday());
         user.setUpdateTime(DateUtil.date());
         user.setSex(request.getSex());
+        user.setCompanyName(request.getCompanyName());
         return updateById(user);
     }