From e4dde712e6cbf1c6c2536f8336bf1c26b210bf0a Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Tue, 23 Apr 2024 00:42:51 +0800
Subject: [PATCH] init

---
 .../com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 c12ff3a..d346fd8 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
@@ -68,7 +68,8 @@ public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,User
         }
         List<Long> userIds = records.stream().map(UserPicturesAdminMergeVo::getUserId).collect(Collectors.toList());
         List<UserPictures> list = this.list(Wrappers.lambdaQuery(UserPictures.class)
-                .in(UserPictures::getUserId, userIds));
+                .in(UserPictures::getUserId, userIds)
+                .eq(UserPictures::getAuditStatus, AuditEnum.SUCCESS.getCode()));
         Map<Long, List<UserPictures>> userIdPictursMap = list.stream().collect(Collectors.groupingBy(UserPictures::getUserId));
         for (UserPicturesAdminMergeVo record : records) {
             record.setUserPictureList(userIdPictursMap.getOrDefault(record.getUserId(), Collections.emptyList()));
@@ -90,8 +91,9 @@ public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,User
         List<UserPictures> userPicturesList = this.listByUserIdAuditingAndSuccess(userId);
         // 处理新增
         List<Long> pictureIds = new ArrayList<>();
-        for (UserPictures pictures : userPicturesList) {
+        for (UserPictures pictures : userPictures) {
             if(pictures.getId() == null){
+                pictures.setUsercode(minUser.getUsercode());
                 pictures.setAuditStatus(AuditEnum.SUCCESS.getCode());
                 pictures.setAuditRemark("后台管理操作");
                 this.save(pictures);