提交分类： 测试版本；

提交内容：  数据查询bug
当前版本：  正式版本6.3.4
是否冲突：  否

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jun 13 11:08:53 CST 2018
+#Wed Jul 04 11:24:14 CST 2018
 debugName=502
-versionName=633
+versionName=634
 debugCode=502
-versionCode=174
+versionCode=175

app_core/common/src/main/res/layout/action_data_inquiry_list.xml

@@ -3,15 +3,17 @@
     android:id="@+id/top"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:paddingRight="@dimen/paddingMin"
-    android:layout_height="?attr/actionBarSize">
+    android:layout_height="?attr/actionBarSize"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:paddingRight="@dimen/paddingMin">
 
     <ImageView
         android:id="@+id/back"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_baseutil_back"/>
+        android:src="@drawable/ic_baseutil_back" />
 
     <ImageView
         android:id="@+id/data_inquiry_filter_iv"
@@ -19,7 +21,7 @@
         android:layout_height="match_parent"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_advanced_filter"/>
+        android:src="@drawable/ic_advanced_filter" />
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -43,7 +45,7 @@
             android:paddingRight="26dp"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
-            android:textSize="14sp"/>
+            android:textSize="14sp" />
 
         <ImageView
             android:id="@+id/data_inquiry_voice_iv"
@@ -54,7 +56,7 @@
             android:layout_centerVertical="true"
             android:layout_marginRight="6dp"
             android:background="@drawable/btn_yuyin_nor"
-            android:visibility="visible"/>
+            android:visibility="visible" />
     </RelativeLayout>
 
 

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/DataInquiryListActivity.java

@@ -1001,10 +1001,10 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 } else {
                     mCondition = "";
                     for (int i = 0; i < mfuzzySchemeConditionBeans.size(); i++) {
-                        mCondition = mCondition + "("
+                        mCondition = mCondition + "(upper("
                                 + (TextUtils.isEmpty(mfuzzySchemeConditionBeans.get(i).getTable()) ? "" : (mfuzzySchemeConditionBeans.get(i).getTable() + "."))
                                 + mfuzzySchemeConditionBeans.get(i).getField()
-                                + " like \'%" + searchField + "%\') or ";
+                                + ") like upper(\'%" + searchField + "%\')) or ";
                     }
                     if (mCondition.length() >= 4) {
                         mCondition = mCondition.substring(0, mCondition.length() - 4);