修改按照表名查询报错的问题
This commit is contained in:
parent
cbef3ddb05
commit
577f476433
|
|
@ -351,8 +351,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
||||||
queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy());
|
queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy());
|
||||||
queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
|
queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
|
||||||
queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
|
queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
|
||||||
queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
|
// queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
|
||||||
queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType()),"cgd_type",cgdMainEntityDto.getCgdType());
|
if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){
|
||||||
|
if (cgdMainEntityDto.getCgdType().indexOf(",")>-1){
|
||||||
|
queryWrapper.in("cgd_type",cgdMainEntityDto.getCgdType().split(","));
|
||||||
|
}else if (cgdMainEntityDto.getCgdType().indexOf(",")==-1){
|
||||||
|
queryWrapper.eq("cgd_type",cgdMainEntityDto.getCgdType());
|
||||||
|
}
|
||||||
|
}
|
||||||
Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
|
Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
|
||||||
List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(page,queryWrapper);
|
List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(page,queryWrapper);
|
||||||
IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
|
IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
|
||||||
|
|
|
||||||
|
|
@ -300,12 +300,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
||||||
text = SqlInjectionUtil.getSqlInjectField(text);
|
text = SqlInjectionUtil.getSqlInjectField(text);
|
||||||
code = SqlInjectionUtil.getSqlInjectField(code);
|
code = SqlInjectionUtil.getSqlInjectField(code);
|
||||||
List<DictModel> dictModels = Lists.newArrayList();
|
List<DictModel> dictModels = Lists.newArrayList();
|
||||||
int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled");
|
// int existIzEnabled = sysDictMapper.existColumn(table, "iz_enabled");
|
||||||
if(existIzEnabled>0){
|
// if(existIzEnabled>0){
|
||||||
dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, "1");
|
// dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, "1");
|
||||||
}else{
|
// }else{
|
||||||
dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
|
// dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
|
||||||
}
|
// }
|
||||||
|
dictModels = sysDictMapper.queryTableDictWithFilter(table, text, code, filterSql, null);
|
||||||
return dictModels;
|
return dictModels;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue