|
@@ -207,10 +207,10 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
|
|
|
public int insertDept(SysDept dept) {
|
|
|
dept.setDeptId(IdWorker.getId());
|
|
|
|
|
|
- //添加公司时将租户id赋值成自己
|
|
|
- if (dept.getType() == 0) {
|
|
|
- dept.setTenantId(String.valueOf(dept.getDeptId()));
|
|
|
- }
|
|
|
+// //添加公司时将租户id赋值成自己
|
|
|
+// if (dept.getType() == 0) {
|
|
|
+// dept.setTenantId(String.valueOf(dept.getDeptId()));
|
|
|
+// }
|
|
|
|
|
|
SysDept info = deptMapper.selectDeptById(dept.getParentId());
|
|
|
// 如果父节点不为正常状态,则不允许新增子节点
|
|
@@ -223,53 +223,53 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
|
|
|
throw new ServiceException("添加部门失败");
|
|
|
}
|
|
|
|
|
|
- //添加公司时添加租户
|
|
|
- if (dept.getType() == 0) {
|
|
|
- TenantInfoBo tenantInfoDto = new TenantInfoBo();
|
|
|
- tenantInfoDto.setId(IdWorker.getId());
|
|
|
- tenantInfoDto.setTenantId(String.valueOf(dept.getDeptId()));
|
|
|
- tenantInfoDto.setEnterpriseName(dept.getDeptName());
|
|
|
- deptMapper.addTenantInfo(tenantInfoDto);
|
|
|
-
|
|
|
-// SysDept sysDept = new SysDept();
|
|
|
-// sysDept.setParentId(0L);
|
|
|
-// sysDept.setDeptName(tenantInfoDto.getEnterpriseName());
|
|
|
-// sysDept.setOrderNum(1);
|
|
|
-// sysDept.setStatus("0");
|
|
|
-// sysDept.setType(0);
|
|
|
-// sysDept.setTenantId(tenantInfoDto.getTenantId());
|
|
|
-// sysDept.setCreateBy(SecurityUtils.getUsername());
|
|
|
-// sysDept.setCreateTime(new Date());
|
|
|
-// sysDeptService.save(sysDept);
|
|
|
-
|
|
|
- SysUser sysUser = new SysUser();
|
|
|
- sysUser.setDeptId(dept.getDeptId());
|
|
|
- sysUser.setTenantId(tenantInfoDto.getTenantId());
|
|
|
- sysUser.setUserName("admin");
|
|
|
- sysUser.setNickName(tenantInfoDto.getEnterpriseName() + "管理员");
|
|
|
-
|
|
|
- BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
|
|
|
- String pwd = passwordEncoder.encode("123456");
|
|
|
-
|
|
|
- sysUser.setPassword(pwd);
|
|
|
- sysUser.setStatus("0");
|
|
|
- sysUser.setCreateBy(SecurityUtils.getUsername());
|
|
|
- sysUser.setCreateTime(new Date());
|
|
|
- sysUserService.save(sysUser);
|
|
|
-
|
|
|
- SysRole sysRole = new SysRole();
|
|
|
- sysRole.setRoleName("管理员");
|
|
|
- sysRole.setRoleKey("admin");
|
|
|
- sysRole.setRoleSort(1);
|
|
|
- sysRole.setDataScope("1");
|
|
|
- sysRole.setStatus("0");
|
|
|
- sysRole.setTenantId(tenantInfoDto.getTenantId());
|
|
|
- sysRole.setCreateBy(SecurityUtils.getUsername());
|
|
|
- sysRole.setCreateTime(new Date());
|
|
|
- sysRoleService.save(sysRole);
|
|
|
-
|
|
|
- sysRoleService.insertAuthUsers(sysRole.getRoleId(), new Long[]{sysUser.getUserId()});
|
|
|
- }
|
|
|
+// //添加公司时添加租户
|
|
|
+// if (dept.getType() == 0) {
|
|
|
+// TenantInfoBo tenantInfoDto = new TenantInfoBo();
|
|
|
+// tenantInfoDto.setId(IdWorker.getId());
|
|
|
+// tenantInfoDto.setTenantId(String.valueOf(dept.getDeptId()));
|
|
|
+// tenantInfoDto.setEnterpriseName(dept.getDeptName());
|
|
|
+// deptMapper.addTenantInfo(tenantInfoDto);
|
|
|
+//
|
|
|
+//// SysDept sysDept = new SysDept();
|
|
|
+//// sysDept.setParentId(0L);
|
|
|
+//// sysDept.setDeptName(tenantInfoDto.getEnterpriseName());
|
|
|
+//// sysDept.setOrderNum(1);
|
|
|
+//// sysDept.setStatus("0");
|
|
|
+//// sysDept.setType(0);
|
|
|
+//// sysDept.setTenantId(tenantInfoDto.getTenantId());
|
|
|
+//// sysDept.setCreateBy(SecurityUtils.getUsername());
|
|
|
+//// sysDept.setCreateTime(new Date());
|
|
|
+//// sysDeptService.save(sysDept);
|
|
|
+//
|
|
|
+// SysUser sysUser = new SysUser();
|
|
|
+// sysUser.setDeptId(dept.getDeptId());
|
|
|
+// sysUser.setTenantId(tenantInfoDto.getTenantId());
|
|
|
+// sysUser.setUserName("admin");
|
|
|
+// sysUser.setNickName(tenantInfoDto.getEnterpriseName() + "管理员");
|
|
|
+//
|
|
|
+// BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
|
|
|
+// String pwd = passwordEncoder.encode("123456");
|
|
|
+//
|
|
|
+// sysUser.setPassword(pwd);
|
|
|
+// sysUser.setStatus("0");
|
|
|
+// sysUser.setCreateBy(SecurityUtils.getUsername());
|
|
|
+// sysUser.setCreateTime(new Date());
|
|
|
+// sysUserService.save(sysUser);
|
|
|
+//
|
|
|
+// SysRole sysRole = new SysRole();
|
|
|
+// sysRole.setRoleName("管理员");
|
|
|
+// sysRole.setRoleKey("admin");
|
|
|
+// sysRole.setRoleSort(1);
|
|
|
+// sysRole.setDataScope("1");
|
|
|
+// sysRole.setStatus("0");
|
|
|
+// sysRole.setTenantId(tenantInfoDto.getTenantId());
|
|
|
+// sysRole.setCreateBy(SecurityUtils.getUsername());
|
|
|
+// sysRole.setCreateTime(new Date());
|
|
|
+// sysRoleService.save(sysRole);
|
|
|
+//
|
|
|
+// sysRoleService.insertAuthUsers(sysRole.getRoleId(), new Long[]{sysUser.getUserId()});
|
|
|
+// }
|
|
|
return addCount;
|
|
|
}
|
|
|
|