From 47c6bd325b3eddf3d4d224dd367ffbaa9318f2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Wed, 21 Dec 2022 10:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A8=E6=80=81=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/module/app/model/vo/AppDatasetVo.java | 4 +++-
.../module/app/web/AppDatasetController.java | 1 +
.../sqlmap/module/app/AppDatasetMapperExt.xml | 19 +++++++++++++------
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppDatasetVo.java b/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppDatasetVo.java
index e532bd0b..aa61985d 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppDatasetVo.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppDatasetVo.java
@@ -29,6 +29,8 @@ public class AppDatasetVo extends BaseEntityLong {
*/
private String fieldValue;
- private List <Long> idList;
+ private Long appId;
+
+ private List<Long> idList;
}
\ No newline at end of file
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java b/base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java
index 6327429c..a91c669e 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java
@@ -67,6 +67,7 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
appDatasetQuery.setFieldCode(query.getFieldCode());
appDatasetQuery.setFieldName(query.getFieldName());
+ appDatasetQuery.setAppId(query.getAppId());
String fieldValue = StrUtil.addPrefixIfNot(query.getFieldValue(), "%");
fieldValue = StrUtil.addSuffixIfNot(fieldValue, "%");
appDatasetQuery.setFieldValue(fieldValue);
diff --git a/base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml b/base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml
index b47a723e..9a6e2a0a 100644
--- a/base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml
+++ b/base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml
@@ -12,15 +12,19 @@
<trim suffixOverrides="where" suffix="">
where 1=1 and
<trim prefixOverrides="and" prefix="">
+ <if test="condition.appId!=null and condition.appId!=''">
+ and a.appId = #{condition.appId,jdbcType=VARCHAR}
+ </if>
<if test="condition.fieldCode!=null and condition.fieldCode!=''">
- and a.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
+ and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
</if>
<if test="condition.fieldName!=null and condition.fieldName!=''">
- and a.fieldName = #{condition.fieldName,jdbcType=VARCHAR}
+ and b.fieldName = #{condition.fieldName,jdbcType=VARCHAR}
</if>
<if test="condition.fieldValue != null and condition.fieldValue != ''">
- and a.fieldValue like #{condition.fieldValue}
+ and b.fieldValue like #{condition.fieldValue}
</if>
+
</trim>
</trim>
</select>
@@ -35,14 +39,17 @@
<trim suffixOverrides="where" suffix="">
where 1=1 and
<trim prefixOverrides="and" prefix="">
+ <if test="condition.appId!=null and condition.appId!=''">
+ and a.appId = #{condition.appId,jdbcType=VARCHAR}
+ </if>
<if test="condition.fieldCode!=null and condition.fieldCode!=''">
- and a.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
+ and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
</if>
<if test="condition.fieldName!=null and condition.fieldName!=''">
- and a.fieldName = #{condition.fieldName,jdbcType=VARCHAR}
+ and b.fieldName = #{condition.fieldName,jdbcType=VARCHAR}
</if>
<if test="condition.fieldValue != null and condition.fieldValue != ''">
- and a.fieldValue like #{condition.fieldValue}
+ and b.fieldValue like #{condition.fieldValue}
</if>
</trim>
</trim>
--
2.24.3