kaifabu/AssetsMap
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加查询条件

Browse Source
This commit is contained in:
RuicyWu
2026-06-18 17:56:31 +08:00
parent 8e3dd5e1cd
commit cf40ccbdb0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/seeyon/apps/assetsmap/service/AssetsQueryService.java
View File

@@ -82,7 +82,6 @@ public class AssetsQueryService {
// 代码层过滤权限，避免 LIKE 导致索引失效 // 代码层过滤权限，避免 LIKE 导致索引失效
boolean showAll = showAll(); boolean showAll = showAll();
log.info("是否允许查看所有数据: " + showAll); log.info("是否允许查看所有数据: " + showAll);
final String permIdStr = showAll ? null : (AppContext.currentAccountId() + "");
if (StringUtils.isNotBlank(vo.getOwner())) { if (StringUtils.isNotBlank(vo.getOwner())) {
conditions.add(FormWhereCondition.build().display("所属单位").value(vo.getOwner())); conditions.add(FormWhereCondition.build().display("所属单位").value(vo.getOwner()));
} }
@@ -503,7 +502,8 @@ public class AssetsQueryService {
.concatFactor(ClauseFactor.OR)); .concatFactor(ClauseFactor.OR));
conditions.add(FormWhereCondition.build().display("资产编号").value(vo.getKeyword()).clauseFactor(ClauseFactor.LIKE)); conditions.add(FormWhereCondition.build().display("资产编号").value(vo.getKeyword()).clauseFactor(ClauseFactor.LIKE));
} }
conditions.add(FormWhereCondition.build().display("经度-").clauseFactor(ClauseFactor.NOT_NULL));
conditions.add(FormWhereCondition.build().display("纬度-").clauseFactor(ClauseFactor.NOT_NULL));
// 先查全量用于权限过滤 // 先查全量用于权限过滤
List<FormColumn> formColumns = FormTableExecutor.query(tableContext, null, conditions, true); List<FormColumn> formColumns = FormTableExecutor.query(tableContext, null, conditions, true);