From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java
index f2b1e65..615ceb1 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java
@@ -10,9 +10,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.domain.ZAbroad;
import com.ruoyi.domain.ZHonor;
-import com.ruoyi.domain.ZfCollection;
import com.ruoyi.mapper.ZHonorMapper;
import com.ruoyi.service.ZHonorService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +18,11 @@
import org.springframework.transaction.annotation.Transactional;
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;
/**
* <p>
@@ -37,6 +37,9 @@
@Autowired
ZHonorServiceImpl zHonorService;
+
+ @Resource
+ ZHonorMapper zHonorMapper;
private LambdaQueryWrapper<ZHonor> uniqueCondition(ZHonor zHonor){
LambdaQueryWrapper<ZHonor> lqw = new LambdaQueryWrapper<>();
@@ -93,6 +96,22 @@
}
@Override
+ public List<ZHonor> selectByIds(Long[] ids) {
+ List<ZHonor> list = new ArrayList<>();
+ if(!(ids==null||ids.length==0))
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
+ @Override
+ public AjaxResult listType() {
+ List<String> result = zHonorMapper.listType();
+ return AjaxResult.success(result);
+ }
+
+ @Override
public AjaxResult mySave(ZHonor zHonor) {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
--
Gitblit v1.9.1