zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 新增业务流程任务表单可配置自定义路由表单选项

Browse Source 
fix:
1. 修复 mysql 脚本部分字段未同步脚本的错误
2. 角色为空无法登录系统
3. 主子表缩写命名下代码生成器错误

(cherry picked from commit 3812611b04)
This commit is contained in:
chenbowen
2025-08-06 17:45:38 +08:00
committed by chenbowen
parent 2fee797fe8
commit d21418fb1e
44 changed files with 1037 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
View File

@@ -79,7 +79,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
o -> o.setDataSourceConfigId(1L).setTableNames(Collections.singletonList("t_yunai")));
// mock 方法（TableInfo）
TableInfo tableInfo = mock(TableInfo.class);
when(databaseTableService.getTable(eq(1L), eq("t_yunai")))
when(databaseTableService.getTable(eq(1L), eq("t_yunai"), false))
.thenReturn(tableInfo);
when(tableInfo.getComment()).thenReturn("芋艿");
// mock 方法（TableInfo fields）
@@ -91,7 +91,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
when(tableInfo.getFields()).thenReturn(fields);
// mock 方法（CodegenTableDO）
CodegenTableDO table = randomPojo(CodegenTableDO.class);
when(codegenBuilder.buildTable(same(tableInfo))).thenReturn(table);
when(codegenBuilder.buildTable(same(tableInfo), false)).thenReturn(table);
// mock 方法（CodegenColumnDO）
List<CodegenColumnDO> columns = randomPojoList(CodegenColumnDO.class);
when(codegenBuilder.buildColumns(eq(table.getId()), same(fields)))
@@ -240,7 +240,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
Long tableId = table.getId();
// mock 方法（TableInfo）
TableInfo tableInfo = mock(TableInfo.class);
when(databaseTableService.getTable(eq(1L), eq("t_yunai")))
when(databaseTableService.getTable(eq(1L), eq("t_yunai"), false))
.thenReturn(tableInfo);
when(tableInfo.getComment()).thenReturn("芋艿");
// mock 方法（TableInfo fields）
@@ -250,7 +250,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
when(field03.getComment()).thenReturn("分类");
List<TableField> fields = Arrays.asList(field01, field03);
when(tableInfo.getFields()).thenReturn(fields);
when(databaseTableService.getTable(eq(1L), eq("t_yunai")))
when(databaseTableService.getTable(eq(1L), eq("t_yunai"), false))
.thenReturn(tableInfo);
// mock 方法（CodegenTableDO）
List<CodegenColumnDO> newColumns = randomPojoList(CodegenColumnDO.class, 2);

2
yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java
View File

@@ -32,7 +32,7 @@ public class CodegenBuilderTest extends BaseMockitoUnitTest {
when(tableInfo.getComment()).thenReturn("用户");
// 调用
CodegenTableDO table = codegenBuilder.buildTable(tableInfo);
CodegenTableDO table = codegenBuilder.buildTable(tableInfo, false);
// 断言
assertEquals("system_user", table.getTableName());
assertEquals("用户", table.getTableComment());