租户获取创建者修改者

user_center/src/main/java/com/huaxu/dto/TenantDto.java

@@ -20,7 +20,7 @@ public class TenantDto extends TenantEntity {
     @ApiModelProperty("用户id")
     private Long userId;
     @ApiModelProperty("租户类型展示值")
-    private String dictValue;
+    private String tenantTypeValue;
     @ApiModelProperty("管理员姓名")
     private String userName;
     @ApiModelProperty("手机号")

user_center/src/main/java/com/huaxu/service/impl/TenantServiceImpl.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.dao.TenantMapper;
 import com.huaxu.dto.TenantDto;
 import com.huaxu.entity.UserEntity;
+import com.huaxu.model.LoginUser;
 import com.huaxu.service.TenantService;
 import com.huaxu.service.UserService;
 import com.huaxu.util.Snowflake;
+import com.huaxu.util.UserUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -74,14 +76,14 @@ public class TenantServiceImpl implements TenantService {
      */
     @Override
     public Integer insert(TenantDto tenantDto) {
-//        LoginUser loginUser = UserUtil.getCurrentUser();
+        LoginUser loginUser = UserUtil.getCurrentUser();
         //创建租户信息
-//        tenantDto.setCreateBy(loginUser.getUsername());
+        tenantDto.setCreateBy(loginUser.getUsername());
         tenantDto.setDateCreate(new Date());
-//        tenantDto.setUpdateBy(loginUser.getUsername());
+        tenantDto.setUpdateBy(loginUser.getUsername());
         tenantDto.setDateUpdate(new Date());
         tenantDto.setCode(Snowflake.generateId().toString());
-        tenantDto.setStatus(0);
+        tenantDto.setStatus(1);
         tenantMapper.insert(tenantDto);
         //创建管理员信息
         UserEntity userEntity =new UserEntity();
@@ -90,7 +92,7 @@ public class TenantServiceImpl implements TenantService {
         userEntity.setDateCreate(new Date());
         userEntity.setUpdateBy(tenantDto.getUpdateBy());
         userEntity.setDateUpdate(new Date());
-        userEntity.setStatus(0);
+        userEntity.setStatus(1);
         userEntity.setPhone(tenantDto.getPhone());
         userEntity.setUsername(tenantDto.getUserName());
         userEntity.setUserType("1");//租户系统管理员
@@ -111,12 +113,12 @@ public class TenantServiceImpl implements TenantService {
      */
     @Override
     public int update(TenantDto tenantDto) {
-//        LoginUser loginUser = UserUtil.getCurrentUser();
+        LoginUser loginUser = UserUtil.getCurrentUser();
         if(tenantDto.getId() == null){
             return 0;
         }
         //修改租户信息
-//        tenantDto.setUpdateBy(loginUser.getUsername());
+        tenantDto.setUpdateBy(loginUser.getUsername());
         tenantDto.setDateUpdate(new Date());
 
         tenantMapper.update(tenantDto);

user_center/src/main/resources/mapper/TenantMapper.xml

@@ -13,7 +13,7 @@
         ,t.LOGO as "logo"
         ,t.WEB_URL as "webUrl"
         ,t.DATE_CREATE as "dateCreate"
-        ,dict.DICT_VALUE as "dictValue"
+        ,dict.DICT_VALUE as "tenantTypeValue"
     </sql>
 
     <sql id="tenantJoins">