提交 fae8c580 作者: xiaowang

修复:目录报错问题

上级 fa9a9c96
...@@ -6,10 +6,10 @@ import lombok.AllArgsConstructor; ...@@ -6,10 +6,10 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.stream.Collectors;
/** /**
* 目录管理表(Directory)实体类 * 目录管理表(Directory)实体类
...@@ -43,7 +43,7 @@ public class DirectoryDO implements Serializable { ...@@ -43,7 +43,7 @@ public class DirectoryDO implements Serializable {
public DirectoryDO(DirectoryInfoVO param) { public DirectoryDO(DirectoryInfoVO param) {
if (CollectionUtils.isNotEmpty(param.getShow())) { if (CollectionUtils.isNotEmpty(param.getShow())) {
String show = StringUtils.join(param.getShow(), ","); String show = param.getShow().stream().map(Object::toString).collect(Collectors.joining(","));
this.show = show; this.show = show;
} }
this.id = param.getId(); this.id = param.getId();
......
...@@ -51,7 +51,7 @@ public class CategoriesServiceImpl implements CategoriesService { ...@@ -51,7 +51,7 @@ public class CategoriesServiceImpl implements CategoriesService {
} else { } else {
// 获取默认目录信息 // 获取默认目录信息
DirectoryDO directoryDO = categoriesDao.selectDirectoryById(param.getId()); DirectoryDO directoryDO = categoriesDao.selectDirectoryById(param.getId());
if (!directoryDO.getDirectoryName().equals(param.getDirectoryName())) { if (directoryDO != null && !directoryDO.getDirectoryName().equals(param.getDirectoryName())) {
return ResultBody.error(ResultEnum.DEFAULT_DIRECTORY); return ResultBody.error(ResultEnum.DEFAULT_DIRECTORY);
} }
categoriesDao.updateDirectory(directory); categoriesDao.updateDirectory(directory);
......
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
is_deleted is_deleted
</sql> </sql>
<insert id="insertDirectory"> <insert id="insertDirectory">
insert into directory(directory_name, insert into directory (directory_name, `type`, `show`)
`type`, show)
values (#{directoryName}, #{type}, #{show}) values (#{directoryName}, #{type}, #{show})
</insert> </insert>
<insert id="insertClassification"> <insert id="insertClassification">
...@@ -43,7 +42,7 @@ ...@@ -43,7 +42,7 @@
update directory update directory
set directory_name = #{directoryName}, set directory_name = #{directoryName},
`type` = #{type}, `type` = #{type},
show = #{show} `show` = #{show}
where id = #{id} where id = #{id}
</update> </update>
<update id="removeDirectory"> <update id="removeDirectory">
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论