diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java index 53a704c..26beff9 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java @@ -46,7 +46,7 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.ne("code", "100"); - List list = sysDataSourceService.list(queryWrapper); + List list = sysDataSourceService.getDataSourcelist(queryWrapper); // 使用Set去重 List distinctList = new ArrayList<>(); diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java index 4d0c1dd..93a325a 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDataSourceService.java @@ -1,5 +1,6 @@ package org.jeecg.modules.system.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.system.entity.SysDataSource; @@ -49,4 +50,6 @@ public interface ISysDataSourceService extends IService { * @return */ SysDataSource getBySysOrgCode(String sysOrgCode); + + List getDataSourcelist(QueryWrapper queryWrapper); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java index 714d91f..ea8ffa9 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDataSourceServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.system.service.impl; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.creator.DataSourceProperty; import com.baomidou.dynamic.datasource.creator.druid.DruidDataSourceCreator; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -163,4 +164,10 @@ public class SysDataSourceServiceImpl extends ServiceImpl getDataSourcelist(QueryWrapper queryWrapper) { + return baseMapper.selectList(queryWrapper); + } }