|
|
@@ -155,7 +155,8 @@ public class SysTenantServiceImpl implements ISysTenantService {
|
|
|
SysUser user = new SysUser();
|
|
|
user.setTenantId(tenantId);
|
|
|
user.setUserName(bo.getUsername());
|
|
|
- user.setNickName(bo.getUsername());
|
|
|
+ // 尽可能不使用用户名进行,使用联系人作为管理员目前比较好时间
|
|
|
+ user.setNickName(bo.getContactUserName());
|
|
|
user.setPassword(BCrypt.hashpw(bo.getPassword()));
|
|
|
user.setDeptId(deptId);
|
|
|
userMapper.insert(user);
|
|
|
@@ -171,44 +172,45 @@ public class SysTenantServiceImpl implements ISysTenantService {
|
|
|
userRole.setRoleId(roleId);
|
|
|
userRoleMapper.insert(userRole);
|
|
|
|
|
|
- String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID;
|
|
|
- List<SysDictType> dictTypeList = dictTypeMapper.selectList(
|
|
|
- new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getTenantId, defaultTenantId));
|
|
|
- List<SysDictData> dictDataList = dictDataMapper.selectList(
|
|
|
- new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getTenantId, defaultTenantId));
|
|
|
- for (SysDictType dictType : dictTypeList) {
|
|
|
- dictType.setDictId(null);
|
|
|
- dictType.setTenantId(tenantId);
|
|
|
- dictType.setCreateDept(null);
|
|
|
- dictType.setCreateBy(null);
|
|
|
- dictType.setCreateTime(null);
|
|
|
- dictType.setUpdateBy(null);
|
|
|
- dictType.setUpdateTime(null);
|
|
|
- }
|
|
|
- for (SysDictData dictData : dictDataList) {
|
|
|
- dictData.setDictCode(null);
|
|
|
- dictData.setTenantId(tenantId);
|
|
|
- dictData.setCreateDept(null);
|
|
|
- dictData.setCreateBy(null);
|
|
|
- dictData.setCreateTime(null);
|
|
|
- dictData.setUpdateBy(null);
|
|
|
- dictData.setUpdateTime(null);
|
|
|
- }
|
|
|
- dictTypeMapper.insertBatch(dictTypeList);
|
|
|
- dictDataMapper.insertBatch(dictDataList);
|
|
|
-
|
|
|
- List<SysConfig> sysConfigList = configMapper.selectList(
|
|
|
- new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getTenantId, defaultTenantId));
|
|
|
- for (SysConfig config : sysConfigList) {
|
|
|
- config.setConfigId(null);
|
|
|
- config.setTenantId(tenantId);
|
|
|
- config.setCreateDept(null);
|
|
|
- config.setCreateBy(null);
|
|
|
- config.setCreateTime(null);
|
|
|
- config.setUpdateBy(null);
|
|
|
- config.setUpdateTime(null);
|
|
|
- }
|
|
|
- configMapper.insertBatch(sysConfigList);
|
|
|
+ // TODO 目前的设计中,所有的字典等信息为通用信息。后续如果有隔离的需求,再将此处放开,并将前端同步租户的按钮放开
|
|
|
+// String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID;
|
|
|
+// List<SysDictType> dictTypeList = dictTypeMapper.selectList(
|
|
|
+// new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getTenantId, defaultTenantId));
|
|
|
+// List<SysDictData> dictDataList = dictDataMapper.selectList(
|
|
|
+// new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getTenantId, defaultTenantId));
|
|
|
+// for (SysDictType dictType : dictTypeList) {
|
|
|
+// dictType.setDictId(null);
|
|
|
+// dictType.setTenantId(tenantId);
|
|
|
+// dictType.setCreateDept(null);
|
|
|
+// dictType.setCreateBy(null);
|
|
|
+// dictType.setCreateTime(null);
|
|
|
+// dictType.setUpdateBy(null);
|
|
|
+// dictType.setUpdateTime(null);
|
|
|
+// }
|
|
|
+// for (SysDictData dictData : dictDataList) {
|
|
|
+// dictData.setDictCode(null);
|
|
|
+// dictData.setTenantId(tenantId);
|
|
|
+// dictData.setCreateDept(null);
|
|
|
+// dictData.setCreateBy(null);
|
|
|
+// dictData.setCreateTime(null);
|
|
|
+// dictData.setUpdateBy(null);
|
|
|
+// dictData.setUpdateTime(null);
|
|
|
+// }
|
|
|
+// dictTypeMapper.insertBatch(dictTypeList);
|
|
|
+// dictDataMapper.insertBatch(dictDataList);
|
|
|
+//
|
|
|
+// List<SysConfig> sysConfigList = configMapper.selectList(
|
|
|
+// new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getTenantId, defaultTenantId));
|
|
|
+// for (SysConfig config : sysConfigList) {
|
|
|
+// config.setConfigId(null);
|
|
|
+// config.setTenantId(tenantId);
|
|
|
+// config.setCreateDept(null);
|
|
|
+// config.setCreateBy(null);
|
|
|
+// config.setCreateTime(null);
|
|
|
+// config.setUpdateBy(null);
|
|
|
+// config.setUpdateTime(null);
|
|
|
+// }
|
|
|
+// configMapper.insertBatch(sysConfigList);
|
|
|
|
|
|
// 未开启工作流不执行下方操作
|
|
|
if (SpringUtils.getProperty("warm-flow.enabled", Boolean.class, false)) {
|