初始化用户过期时间跟随租户

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantConvert.java

@@ -5,6 +5,9 @@ import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqV
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
+import java.time.ZoneId;
+import java.util.Date;
+
 /**
  * 租户 Convert
  *
@@ -19,7 +22,8 @@ public interface TenantConvert {
         UserSaveReqVO reqVO = new UserSaveReqVO();
         reqVO.setUsername(bean.getUsername());
         reqVO.setPassword(bean.getPassword());
-        reqVO.setNickname(bean.getContactName()).setMobile(bean.getContactMobile()).setDeptId(bean.getDeptId());
+        reqVO.setNickname(bean.getContactName()).setMobile(bean.getContactMobile()).setDeptId(bean.getDeptId())
+                .setExpireTime(Date.from(bean.getExpireTime().atZone(ZoneId.systemDefault()).toInstant()));
         return reqVO;
     }
 

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java

@@ -50,6 +50,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -157,7 +158,7 @@ public class TenantServiceImpl implements TenantService {
             // 创建用户，并分配角色
             Long userId = createUser(roleId, createReqVO);
             // 创建init用户，并分配角色
-            InitWorkDTO initUsers = createInitUsers(deptId, tenant.getId(), initRoles);
+            InitWorkDTO initUsers = createInitUsers(deptId, tenant.getId(), initRoles, createReqVO.getExpireTime());
             // 修改租户的管理员
             tenantMapper.updateById(new TenantDO().setId(tenant.getId()).setContactUserId(userId));
             // 创建init作业
@@ -183,7 +184,7 @@ public class TenantServiceImpl implements TenantService {
         return userId;
     }
 
-    private InitWorkDTO createInitUsers(Long deptId, Long tenantId, List<RoleDO> initRoles) {
+    private InitWorkDTO createInitUsers(Long deptId, Long tenantId, List<RoleDO> initRoles, LocalDateTime expireTime) {
         // 初始化需要新增的人员信息
         // 普通管理员
         TenantSaveReqVO tenantSaveReqVO1 = new TenantSaveReqVO();
@@ -192,6 +193,7 @@ public class TenantServiceImpl implements TenantService {
         tenantSaveReqVO1.setUsername("zhangsan");
         tenantSaveReqVO1.setPassword("123890hzb");
         tenantSaveReqVO1.setDeptId(deptId);
+        tenantSaveReqVO1.setExpireTime(expireTime);
         Optional<RoleDO> roleDO1 = initRoles.stream().filter(o -> o.getCode().equals("enSuperadmin")).findFirst();
         Long user1 = createUser(roleDO1.get().getId(), tenantSaveReqVO1);
 
@@ -202,6 +204,7 @@ public class TenantServiceImpl implements TenantService {
         tenantSaveReqVO2.setUsername("lisi");
         tenantSaveReqVO2.setPassword("123890hzb");
         tenantSaveReqVO2.setDeptId(deptId);
+        tenantSaveReqVO2.setExpireTime(expireTime);
         Optional<RoleDO> roleDO2 = initRoles.stream().filter(o -> o.getCode().equals("jtlocker")).findFirst();
         Long lockPerson = createUser(roleDO2.get().getId(), tenantSaveReqVO2);
 
@@ -212,6 +215,7 @@ public class TenantServiceImpl implements TenantService {
         tenantSaveReqVO3.setUsername("wangwu");
         tenantSaveReqVO3.setPassword("123890hzb");
         tenantSaveReqVO3.setDeptId(deptId);
+        tenantSaveReqVO3.setExpireTime(expireTime);
         Optional<RoleDO> roleDO3 = initRoles.stream().filter(o -> o.getCode().equals("jtcolocker")).findFirst();
         Long user3 = createUser(roleDO3.get().getId(), tenantSaveReqVO3);
 
@@ -222,6 +226,7 @@ public class TenantServiceImpl implements TenantService {
         tenantSaveReqVO4.setUsername("wbyy");
         tenantSaveReqVO4.setPassword("123890hzb");
         tenantSaveReqVO4.setDeptId(deptId);
+        tenantSaveReqVO4.setExpireTime(expireTime);
         Optional<RoleDO> roleDO4 = initRoles.stream().filter(o -> o.getCode().equals("jtdrawer")).findFirst();
         Long workerUserId = createUser(roleDO4.get().getId(), tenantSaveReqVO4);
 
@@ -232,6 +237,7 @@ public class TenantServiceImpl implements TenantService {
         tenantSaveReqVO5.setUsername("wbee");
         tenantSaveReqVO5.setPassword("123890hzb");
         tenantSaveReqVO5.setDeptId(deptId);
+        tenantSaveReqVO5.setExpireTime(expireTime);
         Optional<RoleDO> roleDO5 = initRoles.stream().filter(o -> o.getCode().equals("jtdrawer")).findFirst();
         createUser(roleDO5.get().getId(), tenantSaveReqVO5);