|
@@ -125,7 +125,8 @@ public class ColumnVerifyManagementFacade {
|
|
|
public List<GetColumnNameDTO> getColumnName(GetColumnNameVO getColumnNameVO) {
|
|
|
List<ColumnInfo> columnInfoList = columnInfoFacade.getBaseMapper().selectList(new QueryWrapper<ColumnInfo>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
- .eq("table_ename",getColumnNameVO.getTableEname())
|
|
|
+ .eq(StringUtil.isNotBlank(getColumnNameVO.getTableEname()),"table_ename",getColumnNameVO.getTableEname())
|
|
|
+ .eq(StringUtil.isNotBlank(getColumnNameVO.getTableCname()),"table_cname",getColumnNameVO.getTableCname())
|
|
|
.like(StringUtil.isNotBlank(getColumnNameVO.getColumnCname()), "column_cname", getColumnNameVO.getColumnCname())
|
|
|
.like(StringUtil.isNotBlank(getColumnNameVO.getColumnEname()), "column_ename", getColumnNameVO.getColumnEname())
|
|
|
.groupBy("column_cname", "column_ename")
|