From 8e27235844b5640441d810e18e5adc863479735b Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期五, 19 五月 2023 21:41:22 +0800 Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java index e2e279b..928222c 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java @@ -10,11 +10,9 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.domain.ZInfoUser; -import com.ruoyi.domain.ZfClean; +import com.ruoyi.domain.*; import com.ruoyi.domain.ZfClean; -import com.ruoyi.domain.ZfProperty; import com.ruoyi.mapper.ZfCleanMapper; import com.ruoyi.service.ZInfoUserService; import com.ruoyi.service.ZfCleanService; @@ -26,6 +24,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; @@ -208,6 +208,16 @@ return markOwnData(familyIds, beanRecords); } + @Override + public List<ZfClean> selectByIds(Long[] ids) { + List<ZfClean> list = new ArrayList<>(); + if(ids.length!=0) + list = listByIds(Arrays.asList(ids)); + else + list = list(); + return list; + } + private static List<ZfClean> markOwnData(String familyIds, List<ZfClean> beanRecords) { return beanRecords.stream().peek(record -> { String recordFamilyId = record.getFamilyId(); -- Gitblit v1.9.1