From b7f0865107438d5f57b1ec39ca28d81e52bc13fc Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 24 十月 2023 21:26:07 +0800
Subject: [PATCH] 127836
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 9c6d40f..8363562 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
@@ -15,12 +15,14 @@
import com.ruoyi.domain.ZfCollection;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZHonorMapper;
+import com.ruoyi.mapper.ZYearInfoMapper;
import com.ruoyi.service.ZHonorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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;
@@ -40,6 +42,9 @@
@Autowired
ZHonorServiceImpl zHonorService;
+
+ @Resource
+ ZHonorMapper zHonorMapper;
private LambdaQueryWrapper<ZHonor> uniqueCondition(ZHonor zHonor){
LambdaQueryWrapper<ZHonor> lqw = new LambdaQueryWrapper<>();
@@ -98,7 +103,7 @@
@Override
public List<ZHonor> selectByIds(Long[] ids) {
List<ZHonor> list = new ArrayList<>();
- if(ids.length!=0)
+ if(!(ids==null||ids.length==0))
list = listByIds(Arrays.asList(ids));
else
list = list();
@@ -106,6 +111,12 @@
}
@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