Commit 1639b268 authored by 赵啸非's avatar 赵啸非

添加应用serviceApi参数字段

...@@ -75,7 +75,6 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD ...@@ -75,7 +75,6 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
} }
if (!ObjectUtils.isEmpty(query.getFieldCode())||!ObjectUtils.isEmpty(query.getFieldName())) { if (!ObjectUtils.isEmpty(query.getFieldCode())||!ObjectUtils.isEmpty(query.getFieldName())) {
AppDatasetQuery appDatasetQuery = new AppDatasetQuery(); AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
appDatasetQuery.setFieldCode(query.getFieldCode()); appDatasetQuery.setFieldCode(query.getFieldCode());
...@@ -83,7 +82,7 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD ...@@ -83,7 +82,7 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
appDatasetQuery.setAppId(query.getAppId()); appDatasetQuery.setAppId(query.getAppId());
// String fieldValue = StrUtil.addPrefixIfNot(query.getFieldValue(), "%"); // String fieldValue = StrUtil.addPrefixIfNot(query.getFieldValue(), "%");
// fieldValue = StrUtil.addSuffixIfNot(fieldValue, "%"); // fieldValue = StrUtil.addSuffixIfNot(fieldValue, "%");
// appDatasetQuery.setFieldValue(fieldValue); appDatasetQuery.setFieldValue(query.getFieldValue());
PageInfo pageInfo = this.buildPageInfo(query); PageInfo pageInfo = this.buildPageInfo(query);
Result<AppInfoFieldEntity> customResult = this.service.findCustomList(appDatasetQuery, pageInfo, context); Result<AppInfoFieldEntity> customResult = this.service.findCustomList(appDatasetQuery, pageInfo, context);
List<Long> datasetIdList = customResult.getList().stream().map(item -> item.getDatasetId()).collect(Collectors.toList()); List<Long> datasetIdList = customResult.getList().stream().map(item -> item.getDatasetId()).collect(Collectors.toList());
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
and a.appId = #{condition.appId,jdbcType=VARCHAR} and a.appId = #{condition.appId,jdbcType=VARCHAR}
</if> </if>
<!-- <include refid="_second_condition_"/>--> <include refid="_second_condition_"/>
<if test="condition.fieldCode!=null and condition.fieldCode!=''"> <!-- <if test="condition.fieldCode!=null and condition.fieldCode!=''">
and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR} and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
</if> </if>
<if test="condition.fieldName!=null and condition.fieldName!=''"> <if test="condition.fieldName!=null and condition.fieldName!=''">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</if> </if>
<if test="condition.fieldValue != null and condition.fieldValue != ''"> <if test="condition.fieldValue != null and condition.fieldValue != ''">
and b.fieldValue like #{condition.fieldValue} and b.fieldValue like #{condition.fieldValue}
</if> </if>-->
</trim> </trim>
</trim> </trim>
...@@ -44,10 +44,9 @@ ...@@ -44,10 +44,9 @@
<if test="condition.appId!=null and condition.appId!=''"> <if test="condition.appId!=null and condition.appId!=''">
and a.appId = #{condition.appId,jdbcType=VARCHAR} and a.appId = #{condition.appId,jdbcType=VARCHAR}
</if> </if>
<!-- <include refid="_second_condition_"/>
<include refid="_second_condition_"/>-->
<if test="condition.fieldCode!=null and condition.fieldCode!=''"> <!-- <if test="condition.fieldCode!=null and condition.fieldCode!=''">
and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR} and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
</if> </if>
<if test="condition.fieldName!=null and condition.fieldName!=''"> <if test="condition.fieldName!=null and condition.fieldName!=''">
...@@ -55,7 +54,7 @@ ...@@ -55,7 +54,7 @@
</if> </if>
<if test="condition.fieldValue != null and condition.fieldValue != ''"> <if test="condition.fieldValue != null and condition.fieldValue != ''">
and b.fieldValue like #{condition.fieldValue} and b.fieldValue like #{condition.fieldValue}
</if> </if>-->
</trim> </trim>
</trim> </trim>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment