From 82b6d4af3cac6822da1db7bf7ea4e73203b337df Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Tue, 23 Apr 2024 00:13:01 +0800
Subject: [PATCH] init

---
 .../com/ruoyi/xq/controller/UserPicturesController.java   | 2 +-
 .../java/com/ruoyi/xq/service/UserPicturesService.java    | 2 --
 .../ruoyi/xq/service/impl/UserPicturesServiceImpl.java    | 8 +-------
 3 files changed, 2 insertions(+), 10 deletions(-)

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<List<UserPictures>> listByUserId(Long userId){
-        List<UserPictures> userPicturesList = userPicturesService.listByUserIdAll(userId);
+        List<UserPictures> 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<UserPictures>  {
 
     List<UserPictures> listByUserIdSuccess(Long userId);
 
-    List<UserPictures> listByUserIdAll(Long userId);
-
     Page<UserPicturesAdminVo> 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<UserPicturesMapper,User
                 .in(UserPictures::getAuditStatus, AuditEnum.AUDITING.getCode(), AuditEnum.SUCCESS.getCode()));
     }
 
-    @Override
-    public List<UserPictures> listByUserIdAll(Long userId) {
-        return this.list(Wrappers.lambdaQuery(UserPictures.class)
-                .eq(UserPictures::getUserId, userId));
-    }
-
     @Override
     public Page<UserPicturesAdminVo> pageAdmin(PageQuery pageQuery, UserPicturesAdminVo bo) {
         return baseMapper.pageAdmin(pageQuery.build(),bo);
@@ -93,7 +87,7 @@ public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,User
             this.remove(Wrappers.lambdaQuery(UserPictures.class).eq(UserPictures::getUserId, userId));
             return;
         }
-        List<UserPictures> userPicturesList = this.listByUserIdAll(userId);
+        List<UserPictures> userPicturesList = this.listByUserIdAuditingAndSuccess(userId);
         // 处理新增
         List<Long> pictureIds = new ArrayList<>();
         for (UserPictures pictures : userPicturesList) {