添加应用serviceApi参数字段

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppDatasetController.java

@@ -60,7 +60,7 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
 
     @Override
     protected void doListBefore(AppDatasetEntity query, Map<String, Object> model, Context context) throws AppException {
-        if(!ObjectUtils.isEmpty(query.getOrConditionList())){
+     /*   if(!ObjectUtils.isEmpty(query.getOrConditionList())){
             AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
             appDatasetQuery.setAndConditionList(query.getOrConditionList());
             appDatasetQuery.setAppId(query.getAppId());
@@ -73,7 +73,7 @@ public class AppDatasetController extends BaseCRUDJsonBodyMappingController<AppD
             }
             query.setOrConditionList(null);
 
-        }
+        }*/
 
         if (!ObjectUtils.isEmpty(query.getFieldCode())||!ObjectUtils.isEmpty(query.getFieldName())) {
             AppDatasetQuery appDatasetQuery = new AppDatasetQuery();

base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml

@@ -8,7 +8,7 @@
         count( 1 )
         FROM
         mortals_sys_app_dataset a
-        LEFT JOIN mortals_sys_app_info_field b ON b.id = b.datasetId
+        LEFT JOIN mortals_sys_app_info_field b ON a.id = b.datasetId
         <trim suffixOverrides="where" suffix="">
             where 1=1 and
             <trim prefixOverrides="and" prefix="">
@@ -16,8 +16,8 @@
                     and a.appId = #{condition.appId,jdbcType=VARCHAR}
                 </if>
 
-<!--                <include refid="_second_condition_"/>-->
-                <if test="condition.fieldCode!=null and condition.fieldCode!=''">
+                <include refid="_second_condition_"/>
+<!--                <if test="condition.fieldCode!=null and condition.fieldCode!=''">
                     and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
                 </if>
                 <if test="condition.fieldName!=null and condition.fieldName!=''">
@@ -25,7 +25,7 @@
                 </if>
                 <if test="condition.fieldValue != null and condition.fieldValue != ''">
                     and b.fieldValue like #{condition.fieldValue}
-                </if>
+                </if>-->
 
             </trim>
         </trim>
@@ -37,16 +37,16 @@
         <include refid="_columns_sub"/>
         FROM
         mortals_sys_app_dataset a
-        LEFT JOIN mortals_sys_app_info_field b ON b.id = b.datasetId
+        LEFT JOIN mortals_sys_app_info_field b ON a.id = b.datasetId
         <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>
-<!--                <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}
                 </if>
                 <if test="condition.fieldName!=null and condition.fieldName!=''">
@@ -54,7 +54,7 @@
                 </if>
                 <if test="condition.fieldValue != null and condition.fieldValue != ''">
                     and b.fieldValue like #{condition.fieldValue}
-                </if>
+                </if>-->
             </trim>
         </trim>
     </select>