From 51c39e7a4ffe937be1ca3ad0a36cc9a964d60470 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 11 Aug 2022 14:40:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=86=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxkj/admin/service/common/impl/AlbumServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java index d3d7a932..ac2e6759 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java @@ -15,10 +15,7 @@ import com.hxkj.common.entity.album.Album; import com.hxkj.common.entity.album.AlbumCate; import com.hxkj.common.mapper.album.AlbumCateMapper; import com.hxkj.common.mapper.album.AlbumMapper; -import com.hxkj.common.utils.ArrayUtil; -import com.hxkj.common.utils.TimeUtil; -import com.hxkj.common.utils.ToolsUtil; -import com.hxkj.common.utils.UrlUtil; +import com.hxkj.common.utils.*; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -54,7 +51,7 @@ public class AlbumServiceImpl implements IAlbumService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select(Album.class, info-> - !info.getColumn().equals("type") && + !info.getColumn().equals("type") && !info.getColumn().equals("aid") && !info.getColumn().equals("uid") && !info.getColumn().equals("is_delete") && @@ -62,7 +59,7 @@ public class AlbumServiceImpl implements IAlbumService { .eq("is_delete", 0) .orderByDesc("id"); - if (params.get("cid") != null && Integer.parseInt(params.get("cid")) >= 0) { + if (StringUtil.isNotEmpty(params.get("cid"))) { queryWrapper.eq("cid", Integer.parseInt(params.get("cid"))); }