diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java index dcda588..adfe467 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java @@ -78,7 +78,7 @@ public class UserPicturesController extends BaseController { @GetMapping("/listByUserId") public R> listByUserId(Long userId){ - List userPicturesList = userPicturesService.listByUserIdAll(userId); + List userPicturesList = userPicturesService.listByUserIdAuditingAndSuccess(userId); return R.ok(userPicturesList); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java index ca6cc87..55f6596 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java @@ -22,8 +22,6 @@ public interface UserPicturesService extends IService { List listByUserIdSuccess(Long userId); - List listByUserIdAll(Long userId); - Page pageAdmin(PageQuery pageQuery, UserPicturesAdminVo bo); void auditSuccess(String ids); diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java index 4c5ae9e..c12ff3a 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java @@ -54,12 +54,6 @@ public class UserPicturesServiceImpl extends ServiceImpl listByUserIdAll(Long userId) { - return this.list(Wrappers.lambdaQuery(UserPictures.class) - .eq(UserPictures::getUserId, userId)); - } - @Override public Page pageAdmin(PageQuery pageQuery, UserPicturesAdminVo bo) { return baseMapper.pageAdmin(pageQuery.build(),bo); @@ -93,7 +87,7 @@ public class UserPicturesServiceImpl extends ServiceImpl userPicturesList = this.listByUserIdAll(userId); + List userPicturesList = this.listByUserIdAuditingAndSuccess(userId); // 处理新增 List pictureIds = new ArrayList<>(); for (UserPictures pictures : userPicturesList) {