修改bug
This commit is contained in:
parent
eba12725e5
commit
5126166c2f
|
|
@ -46,7 +46,7 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl<ConfigMaterialInf
|
|||
public void syncList() {// 1.查询所有的可用机构
|
||||
QueryWrapper<SysDataSource> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.ne("code", "100");
|
||||
List<SysDataSource> list = sysDataSourceService.list(queryWrapper);
|
||||
List<SysDataSource> list = sysDataSourceService.getDataSourcelist(queryWrapper);
|
||||
|
||||
// 使用Set去重
|
||||
List<NuBizAllMaterialInfo> distinctList = new ArrayList<>();
|
||||
|
|
|
|||
|
|
@ -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<SysDataSource> {
|
|||
* @return
|
||||
*/
|
||||
SysDataSource getBySysOrgCode(String sysOrgCode);
|
||||
|
||||
List<SysDataSource> getDataSourcelist(QueryWrapper<SysDataSource> queryWrapper);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<SysDataSourceMapper, S
|
|||
qw.lambda().eq(true, SysDataSource::getSysOrgCode, sysOrgCode);
|
||||
return getOne(qw);
|
||||
}
|
||||
|
||||
@Override
|
||||
@DS("devops")
|
||||
public List<SysDataSource> getDataSourcelist(QueryWrapper<SysDataSource> queryWrapper) {
|
||||
return baseMapper.selectList(queryWrapper);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue