1. 新增用户与部门,一对多的关系;
2. 新增管理多部门用户,如果有为公司的多个部门可以进行选择登录(选择后,直到下次变更访问公司前,只能访问此次选择公的业务数据,使用 company_id 控制,后续补充此数据权限的实现);
3. sql 转化工具修复,现在可以正确的对 mysql 进行不同数据库实例的转化了;
4. 所有表格主键,修改为分布式 Id 实现;
5. 补全在初始版本中没有被纳入的其他预制功能模块
This commit is contained in:
Administrator
2025-07-01 07:30:25 +00:00
parent 84ddc8ca6e
commit 06b278563e
1254 changed files with 85893 additions and 1524 deletions

View File

@@ -81,9 +81,8 @@ public class OAuth2TokenServiceImplTest extends BaseDbAndRedisUnitTest {
assertPojoEquals(accessTokenDO, dbAccessTokenDO, "expiresTime", "createTime", "updateTime", "deleted");
assertEquals(userId, accessTokenDO.getUserId());
assertEquals(userType, accessTokenDO.getUserType());
assertEquals(3, accessTokenDO.getUserInfo().size());
assertEquals(2, accessTokenDO.getUserInfo().size());
assertEquals(user.getNickname(), accessTokenDO.getUserInfo().get("nickname"));
assertEquals(user.getDeptId().toString(), accessTokenDO.getUserInfo().get("deptId"));
assertEquals(clientId, accessTokenDO.getClientId());
assertEquals(scopes, accessTokenDO.getScopes());
assertFalse(DateUtils.isExpired(accessTokenDO.getExpiresTime()));

View File

@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper;
import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import cn.iocoder.yudao.module.system.service.userdept.UserDeptService;
import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
@@ -43,6 +44,8 @@ public class PermissionServiceTest extends BaseDbUnitTest {
@MockBean
private MenuService menuService;
@MockBean
private UserDeptService userDeptService;
@MockBean
private DeptService deptService;
@MockBean
private AdminUserService userService;

View File

@@ -1,3 +1,15 @@
create table IF NOT EXISTS system_user_dept (
id bigint primary key, -- 自增主键
user_id bigint not null,
dept_id bigint not null,
tenant_id bigint default 0 not null,
remark varchar(2000),
creator varchar(256) default '',
create_time timestamp default current_timestamp not null,
updater varchar(256) default '',
deleted tinyint default 0 not null,
update_time timestamp default current_timestamp not null
);
CREATE TABLE IF NOT EXISTS "system_dept" (
"id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
"name" varchar(30) NOT NULL DEFAULT '',
@@ -14,6 +26,8 @@ CREATE TABLE IF NOT EXISTS "system_dept" (
"deleted" bit NOT NULL DEFAULT FALSE,
"tenant_id" bigint not null default '0',
"is_tenant" bit NOT NULL DEFAULT FALSE,
"is_company" bit NOT NULL DEFAULT FALSE,
"is_group" bit NOT NULL DEFAULT FALSE,
PRIMARY KEY ("id")
) COMMENT '部门表';