回收站操作人查询优化

blade-service/blade-business/src/main/java/org/springblade/business/mapper/RecycleBinInfoMapper.xml

@@ -90,6 +90,6 @@
             <foreach collection="ids" item="id" separator=",">
                 #{id}
             </foreach>
-            ) and is_deleted = 0 group by del_root_id )  group by del_root_id, del_root_name having count(1) > 1
+            ) and is_deleted = 0 group by del_root_id ) and status = 0  group by del_root_id, del_root_name having count(1) > 1
     </select>
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/RecycleBinInfoServiceImpl.java

@@ -83,7 +83,7 @@ public class RecycleBinInfoServiceImpl extends BaseServiceImpl<RecycleBinInfoMap
         if (userVOs.isEmpty()) {
             List<RecycleBinInfo> list = this.list(Wrappers.<RecycleBinInfo>lambdaQuery()
                     .select(RecycleBinInfo::getCreateUser, RecycleBinInfo::getCreateUserName)
-                    .eq(RecycleBinInfo::getContractId, contractId).eq(RecycleBinInfo::getDelType, 2)
+                    .eq(RecycleBinInfo::getContractId, contractId).eq(RecycleBinInfo::getDelType, 2).eq(RecycleBinInfo::getStatus, 0)
                     .groupBy(Arrays.asList(RecycleBinInfo::getCreateUser,RecycleBinInfo::getCreateUserName)));
             if (list != null && !list.isEmpty()) {
                 list.forEach(item -> {
@@ -107,7 +107,7 @@ public class RecycleBinInfoServiceImpl extends BaseServiceImpl<RecycleBinInfoMap
             set.addAll(userVOs1);
             return set;
         }
-        return userVOs;
+        return userVOs1;
     }
 
     @Override