From 604d00f67ddcf25a9d079ceddd1c668b2a4e5288 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 四月 2024 15:08:22 +0800
Subject: [PATCH] bug修复
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java
index 35b6d48..f3d9356 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java
@@ -29,12 +29,12 @@
import com.ruoyi.system.handler.CustomerHandler;
import com.ruoyi.system.handler.SelectedSheetWriteHandler;
import com.ruoyi.system.mapper.TbBasicDataMapper;
+import com.ruoyi.system.mapper.TbFieldCategoryMapper;
import com.ruoyi.system.mapper.TbFieldMapper;
import com.ruoyi.system.query.FieldQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TbBasicDataConfigService;
import com.ruoyi.system.service.TbBasicDataFieldService;
-import com.ruoyi.system.service.TbFieldCategoryService;
import com.ruoyi.system.service.TbFieldService;
import com.ruoyi.system.utils.FieldBuildUtil;
import com.ruoyi.system.vo.BasicDataFieldVO;
@@ -69,7 +69,7 @@
public class TbFieldServiceImpl extends ServiceImpl<TbFieldMapper, TbField> implements
TbFieldService {
- private final TbFieldCategoryService tbFieldCategoryService;
+ private final TbFieldCategoryMapper tbFieldCategoryMapper;
private final TbBasicDataConfigService tbBasicDataConfigService;
private final TbBasicDataMapper tbBasicDataMapper;
private final TbBasicDataFieldService tbBasicDataFieldService;
@@ -90,14 +90,15 @@
}
}
TbField tbField = BeanUtils.copyBean(dto, TbField.class);
- TbFieldCategory category1 = tbFieldCategoryService.getById(dto.getLevelOneCategoryId());
+ TbFieldCategory category1 = tbFieldCategoryMapper.selectById(dto.getLevelOneCategoryId());
tbField.setLevelOneCategory(category1.getFieldCategoryName());
if (StringUtils.isNotNull(dto.getLevelTwoCategoryId())) {
- TbFieldCategory category2 = tbFieldCategoryService.getById(dto.getLevelTwoCategoryId());
+ TbFieldCategory category2 = tbFieldCategoryMapper.selectById(
+ dto.getLevelTwoCategoryId());
tbField.setLevelTwoCategory(category2.getFieldCategoryName());
}
if (StringUtils.isNotNull(dto.getLevelThreeCategoryId())) {
- TbFieldCategory category3 = tbFieldCategoryService.getById(
+ TbFieldCategory category3 = tbFieldCategoryMapper.selectById(
dto.getLevelThreeCategoryId());
tbField.setLevelThreeCategory(category3.getFieldCategoryName());
}
@@ -186,6 +187,7 @@
.eq(TbField::getStatus, ShowStatusEnum.SHOW)
.eq(StringUtils.isNotNull(query.getFieldType()), TbField::getFieldType,
query.getFieldType())
+ .eq(TbField::getFieldType, FieldTypeEnum.NUMBER)
.orderByDesc(TbField::getCreateTime)
.page(new Page<>(query.getPageNum(), query.getPageSize()));
if (CollUtils.isEmpty(page.getRecords())) {
@@ -204,9 +206,16 @@
}
@Override
- public List<FieldVO> listFields() {
+ public List<FieldVO> listFields(String type) {
+ FieldTypeEnum fieldTypeEnum;
+ try {
+ fieldTypeEnum = FieldTypeEnum.getEnumByDesc(type);
+ } catch (IllegalArgumentException e) {
+ throw new ServiceException("非法参数");
+ }
List<TbField> list = this.list(
- Wrappers.<TbField>lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW));
+ Wrappers.<TbField>lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW)
+ .eq(Objects.nonNull(fieldTypeEnum), TbField::getFieldType, fieldTypeEnum));
return BeanUtils.copyList(list, FieldVO.class);
}
--
Gitblit v1.7.1