|
|
@@ -5,7 +5,6 @@ import cn.hutool.core.lang.Validator;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.github.pagehelper.Page;
|
|
|
@@ -15,7 +14,6 @@ import com.zhongzheng.common.exception.CustomException;
|
|
|
import com.zhongzheng.common.utils.DateUtils;
|
|
|
import com.zhongzheng.common.utils.SecurityUtils;
|
|
|
import com.zhongzheng.common.utils.ServletUtils;
|
|
|
-import com.zhongzheng.framework.mybatisplus.CustomTenantLineHandler;
|
|
|
import com.zhongzheng.modules.system.bo.SysTenantAddBo;
|
|
|
import com.zhongzheng.modules.system.bo.SysTenantAdminBo;
|
|
|
import com.zhongzheng.modules.system.bo.SysTenantEditBo;
|
|
|
@@ -28,14 +26,11 @@ import com.zhongzheng.modules.system.service.ISysUserService;
|
|
|
import com.zhongzheng.modules.system.service.ISysWebService;
|
|
|
import com.zhongzheng.modules.system.vo.SysTenantVo;
|
|
|
import org.apache.commons.lang3.RandomStringUtils;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
|
-import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -199,7 +194,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
|
|
|
}
|
|
|
|
|
|
private Long createTenantId(){
|
|
|
- String randomNumeric = RandomStringUtils.randomNumeric(18);
|
|
|
+ String randomNumeric = RandomStringUtils.randomNumeric(15);
|
|
|
int count = count(new LambdaQueryWrapper<SysTenant>()
|
|
|
.eq(SysTenant::getTenantId, Long.valueOf(randomNumeric)));
|
|
|
if (count == 0){
|