提交 1c5cebf6 作者: yanxin

个人素材分组兼容name传参

上级 8c32aa4e
...@@ -59,6 +59,9 @@ public class KnowledgeUserController { ...@@ -59,6 +59,9 @@ public class KnowledgeUserController {
if(loginUser == null){ if(loginUser == null){
return Result.error("用户未登录!"); return Result.error("用户未登录!");
} }
if(StringUtils.isNotEmpty(knowledgeProject.getName())){
knowledgeProject.setTypeName(knowledgeProject.getName());
}
if(StringUtils.isEmpty(knowledgeProject.getPid())||"0".equals(knowledgeProject.getPid())){ if(StringUtils.isEmpty(knowledgeProject.getPid())||"0".equals(knowledgeProject.getPid())){
//未指定时设置为用户根目录 //未指定时设置为用户根目录
knowledgeProject.setPid(loginUser.getId()); knowledgeProject.setPid(loginUser.getId());
...@@ -98,6 +101,9 @@ public class KnowledgeUserController { ...@@ -98,6 +101,9 @@ public class KnowledgeUserController {
if(loginUser == null){ if(loginUser == null){
return Result.error("用户未登录!"); return Result.error("用户未登录!");
} }
if(StringUtils.isNotEmpty(knowledgeProject.getName())){
knowledgeProject.setTypeName(knowledgeProject.getName());
}
KbKnowledgeProject byId = knowledgeProjectService.getById(knowledgeProject.getId()); KbKnowledgeProject byId = knowledgeProjectService.getById(knowledgeProject.getId());
if(byId == null || !loginUser.getId().equals(byId.getPid())){ if(byId == null || !loginUser.getId().equals(byId.getPid())){
return Result.error("分类不存在!"); return Result.error("分类不存在!");
......
...@@ -106,7 +106,7 @@ public class KbKnowledgeProject extends Model<KbKnowledgeProject> { ...@@ -106,7 +106,7 @@ public class KbKnowledgeProject extends Model<KbKnowledgeProject> {
private List<KbRole> roles; private List<KbRole> roles;
@TableField(exist = false) @TableField(exist = false)
private List<KbPermissions> permissions; private List<KbPermissions> permissions;
@TableField(exist = false)
private String name;
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论