10 Commits

Author SHA1 Message Date
chy
ee7510f41e 修改统一身份认证 2026-03-02 15:15:41 +08:00
chy
44279d9637 修改统一身份认证 2026-03-02 10:34:45 +08:00
860afb9812 Merge pull request '新增字段' (#23) from dpx20260211 into master
Reviewed-on: #23
2026-02-28 08:44:07 +08:00
dongpx
0ef88ce81d 新增字段 2026-02-28 08:24:32 +08:00
1b81782767 Merge pull request '应用查询按字典排序值排序' (#21) from main_hhl0209 into master
Reviewed-on: #21
2026-02-25 14:01:54 +08:00
432feb11d2 Merge pull request 'dpx20260211' (#22) from dpx20260211 into master
Reviewed-on: #22
2026-02-25 14:01:28 +08:00
dongpx
1173de364c 新增字段 2026-02-25 10:06:15 +08:00
dongpx
7fb9543604 新增字段 2026-02-14 00:38:17 +08:00
dongpx
bac75778ad 修改字段长度 2026-02-12 11:45:36 +08:00
dongpx
3dd11b9f37 新增字段 2026-02-12 08:38:19 +08:00
7 changed files with 67 additions and 2 deletions

View File

@@ -7,4 +7,30 @@
表名xxx_demo
字段 类型 长度
xx_aa varchar 20
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
日期2026-02-11新增字段
表名yunji_report_field
字段 类型 长度 字段说明
is_dynamic_group varchar 60 是否动态分组 Y|N
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
日期2026-02-12修改字段长度
表名yunji_report_field
字段 类型 长度 字段说明
is_hide_dimension varchar 255
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
日期2026-02-13新增字段
表名yunji_report_field
字段 类型 长度 字段说明
width varchar 60 单元格宽度
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
日期2026-02-24新增字段
表名yunji_report_field
字段 类型 长度 字段说明
search_default_value varchar 150 查询控件默认值
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
日期2026-02-27新增字段
表名yunji_report_field
字段 类型 长度 字段说明
is_hide_search varchar 60 查询控件是否隐藏

View File

@@ -3,6 +3,7 @@ spring:
name: lideeyunji-server
profiles:
active: local # 读取配置
#active: prod # 读取配置
main:
allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。

View File

@@ -107,5 +107,17 @@ public class ReportFieldEntity extends BaseTenantEntity {
//隐藏列的,表单不显示该字段
private String isHideCol;
//是否动态分组 Y|N
private String isDynamicGroup;
//单元格宽度
private String width;
//查询控件默认值
private String searchDefaultValue;
//查询控件隐藏
private String isHideSearch;
}

View File

@@ -72,5 +72,17 @@ public class ReportFieldVo extends ReportFieldIdVo {
//隐藏列的,表单不显示该字段
private String isHideCol;
//是否动态分组 Y|N
private String isDynamicGroup;
//单元格宽度
private String width;
//查询控件默认值
private String searchDefaultValue;
//查询控件隐藏
private String isHideSearch;
}

View File

@@ -382,6 +382,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportEntity> i
entity.setIsFixedColumn(vo.getIsFixedColumn()); //2026-02-10 新增
entity.setFixedColumnValue(vo.getFixedColumnValue()); //2026-02-10 新增
entity.setIsHideCol(vo.getIsHideCol()); //2026.2.10 新增
entity.setSearchDefaultValue(vo.getSearchDefaultValue());
entity.setIsHideSearch(vo.getIsHideSearch());
entity.setWidth(vo.getWidth());
entity.setIsDynamicGroup(vo.getIsDynamicGroup());
entity.setHasChildren(vo.getHasChildren());
entity.setParentFieldCode(vo.getParentFieldCode());
entity.setParentFieldName(vo.getParentFieldName());

View File

@@ -70,13 +70,14 @@
WHERE
report.is_deleted = 0
AND field.is_deleted = 0
AND field.query_is_db = 'Y'
-- AND field.query_is_db = 'Y'
AND report.id = #{reportId}
ORDER BY
field.sort_num ASC,
field.id ASC
</select>
<select id="getExcelExportFieldList" resultType="map">
SELECT
df.field_code as "field_code",

View File

@@ -160,6 +160,15 @@ public class AuthController {
return success(authService.refreshToken(refreshToken));
}
@PostMapping("/user-info")
@PermitAll
@Operation(tags = "根据token获取用户信息",summary = "根据token获取用户信息")
@Parameter(name = "refreshToken", description = "根据token获取用户信息", required = true)
@OperateLog(enable = false) // 避免 Post 请求被记录操作日志
public CommonResult<AuthLoginRespVO> getUerInfo(@RequestParam("refreshToken") String refreshToken) {
return success(authService.refreshToken(refreshToken));
}
@GetMapping("/get-permission-info")
@Operation(tags = "授权管理",summary = "获取登录用户的权限信息")
public CommonResult<AuthPermissionInfoRespVO> getPermissionInfo() {