lbqms.git - Gitblit

			@@ -103,6 +103,7 @@
			lqw.eq(bo.getExpireTime() != null, SysTenant::getExpireTime, bo.getExpireTime());
			lqw.eq(bo.getAccountCount() != null, SysTenant::getAccountCount, bo.getAccountCount());
			lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysTenant::getStatus, bo.getStatus());
			lqw.orderByAsc(SysTenant::getId);
			return lqw;
			}

			@@ -116,7 +117,7 @@

			// 获取所有租户编号
			List<String> tenantIds = baseMapper.selectObjs(
			new LambdaQueryWrapper<SysTenant>().select(SysTenant::getTenantId), Convert::toStr);
			new LambdaQueryWrapper<SysTenant>().select(SysTenant::getTenantId), x -> {return Convert.toStr(x);});
			String tenantId = generateTenantId(tenantIds);
			add.setTenantId(tenantId);
			boolean flag = baseMapper.insert(add) > 0;
			@@ -132,7 +133,6 @@
			SysDept dept = new SysDept();
			dept.setTenantId(tenantId);
			dept.setDeptName(bo.getCompanyName());
			dept.setLeader(bo.getUsername());
			dept.setParentId(Constants.TOP_PARENT_ID);
			dept.setAncestors(Constants.TOP_PARENT_ID.toString());
			deptMapper.insert(dept);
			@@ -152,6 +152,11 @@
			user.setPassword(BCrypt.hashpw(bo.getPassword()));
			user.setDeptId(deptId);
			userMapper.insert(user);
			//新增系统用户后，默认当前用户为部门的负责人
			SysDept sd = new SysDept();
			sd.setLeader(user.getUserId());
			sd.setDeptId(deptId);
			deptMapper.updateById(sd);

			// 用户和角色关联表
			SysUserRole userRole = new SysUserRole();
			@@ -289,7 +294,7 @@
			throw new ServiceException("超管租户不能删除");
			}
			}
			return baseMapper.deleteBatchIds(ids) > 0;
			return baseMapper.deleteByIds(ids) > 0;
			}

			/**
			@@ -337,7 +342,7 @@
			*/
			@Override
			@Transactional(rollbackFor = Exception.class)
			public Boolean syncTenantPackage(String tenantId, String packageId) {
			public Boolean syncTenantPackage(String tenantId, Long packageId) {
			SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId);
			List<SysRole> roles = roleMapper.selectList(
			new LambdaQueryWrapper<SysRole>().eq(SysRole::getTenantId, tenantId));