diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java index 4855117..f3edb96 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.home; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.github.pagehelper.PageInfo; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.R; @@ -109,7 +110,7 @@ public class ColumnTreeController extends BaseController { } columnQueryWrapper.orderByAsc(SysColumn::getOrderNum); List columns = columnService.list(columnQueryWrapper); - if (columns.isEmpty() && StringUtils.isEmpty(columnId)) { + if (columns.isEmpty() && Objects.isNull(columnId)) { columnQueryWrapper.clear(); columnQueryWrapper.eq(SysColumn::getColumnId, id) .eq(SysColumn::getStatus, STATUS) @@ -120,10 +121,9 @@ public class ColumnTreeController extends BaseController { SysSpecialVo sysSpecialVo = new SysSpecialVo(); sysSpecialVo.setColumnId(column.getColumnId()); sysSpecialVo.setColumnName(column.getColumnName()); - SysSpecial sysSpecial = new SysSpecial(); - sysSpecial.setStatus(STATUS); - sysSpecial.setColumnId(column.getColumnId()); - List specialList = specialService.selectSysSpecialList(sysSpecial); + List specialList = specialService.lambdaQuery() + .eq(SysSpecial::getColumnId, column.getColumnId()) + .eq(SysSpecial::getStatus, STATUS).list(); sysSpecialVo.setSysSpecials(specialList); sysSpecialVos.add(sysSpecialVo); }); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSpecialMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSpecialMapper.java index e15e2ce..7651d9b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSpecialMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSpecialMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.SysSpecial; import java.util.List; @@ -7,7 +8,7 @@ import java.util.List; /** * @author wangxy */ -public interface SysSpecialMapper { +public interface SysSpecialMapper extends BaseMapper { /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSpecialService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSpecialService.java index 8e58f5f..22df087 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSpecialService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSpecialService.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.domain.SysSpecial; import java.util.List; @@ -7,7 +8,7 @@ import java.util.List; /** * @author wangxy */ -public interface ISysSpecialService { +public interface ISysSpecialService extends IService { /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSpecialServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSpecialServiceImpl.java index a2cc691..7cd7d2b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSpecialServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSpecialServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.text.Convert; import com.ruoyi.system.domain.SysSpecial; import com.ruoyi.system.mapper.SysSpecialMapper; @@ -15,7 +16,7 @@ import java.util.List; */ @Service @Transactional -public class SysSpecialServiceImpl implements ISysSpecialService { +public class SysSpecialServiceImpl extends ServiceImpl implements ISysSpecialService { @Autowired private SysSpecialMapper specialMapper;