From f8d3c39cbcfc7818d2118e7d1e0a2d5beebfbf9c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 27 三月 2023 09:20:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index f0c8be9..7d66dc5 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -132,7 +132,7 @@
}
Page<Object> page = new Page<>(pageIndex, pageSize);
- page.addOrder(OrderItem.asc("gid"));
+ page.addOrder(OrderItem.desc("gid"));
IPage<Object> paged = baseMapper.selectPage(page, wrapper);
return success(paged.getTotal(), paged.getRecords());
@@ -310,11 +310,8 @@
if (StringHelper.isEmpty(field) || StringHelper.isSqlInjection(field)) {
return fail("鏌ヨ瀛楁涓嶆纭�", null);
}
- if (!StringHelper.isEmpty(value)) {
- value = value.trim().replace("'", "");
- }
- value = StringHelper.getLikeStr2(value);
+ value = StringHelper.isEmpty(value) ? "%" : StringHelper.getLikeUpperStr(value);
List<String> rs = baseMapper.selectFieldFuzzy(tab, field, value);
return success(rs);
@@ -538,18 +535,17 @@
})
@ResponseBody
@PostMapping(value = "/selectDbOverflowDep")
- public ResponseMsg<Object> selectDbOverflowDep(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> selectDbOverflowDep(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
try {
- if (null == reqEntity || null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
+ if (null == dr || null == dr.getEntities() || dr.getEntities().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
}
- reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
- if (StringHelper.isEmpty(reqEntity.getWkt())) {
- return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
+ if (!StringHelper.isEmpty(dr.getWkt())) {
+ dr.setWkt(AesHelper.decrypt(dr.getWkt()));
}
UserEntity ue = tokenService.getCurrentUser(req);
- List<String> list = dataLibService.selectDbOverflowDep(ue, reqEntity.getEntities(), reqEntity.getWkt());
+ List<String> list = dataLibService.selectDbOverflowDep(ue, dr);
return success(list);
} catch (Exception ex) {
--
Gitblit v1.9.3