DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!11sync -- 同步 RuoYi-Vue-Plus 更新

Browse Source 
update 更新uuid去除默认值 漏改
fix 修复 insertOrUpdateBatch 获取模板错误
update 更新 所有 oss 均支持 https 配置
fix 修复分页组件请求两次问题(I4SQOR)
update 去除编译器警告 规范写法

update 更新uuid去除默认值 漏改
fix 修复 insertOrUpdateBatch 获取模板错误
update 更新 所有 oss 均支持 https 配置
fix 修复分页组件请求两次问题(I4SQOR)
update 去除编译器警告 规范写法
add 增加页面更新说明
fix 修复 minio 适配 https 导致的问题
update 更新 多用户多设备的注释说明
发布 4.0.0
This commit is contained in:
konbai
2022-02-19 19:19:37 +08:00
parent fca8d8f99e
commit 863aa2fa33
26 changed files with 151 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
View File

@@ -382,12 +382,13 @@ public class GenTableServiceImpl implements IGenTableService {
@Override
public void validateEdit(GenTable genTable) {
if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
Map<String, Object> paramsObj = genTable.getParams();
if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_CODE))) {
String options = JsonUtils.toJsonString(genTable.getParams());
Dict paramsObj = JsonUtils.parseMap(options);
if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_CODE))) {
throw new ServiceException("树编码字段不能为空");
} else if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_PARENT_CODE))) {
} else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_PARENT_CODE))) {
throw new ServiceException("树父编码字段不能为空");
} else if (ObjectUtil.isEmpty(paramsObj.get(GenConstants.TREE_NAME))) {
} else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_NAME))) {
throw new ServiceException("树名称字段不能为空");
} else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
if (StringUtils.isEmpty(genTable.getSubTableName())) {