raomeng 8 лет назад
Родитель
Сommit
29257f8a7d

+ 6 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/ReportQueryCriteriaActivity.java

@@ -334,14 +334,18 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
         }
 
         Log.d("exactCondition", mCondition);
+        Log.d("defaultCondition", mDefaultCondition);
 
 
         Intent intent = new Intent();
         intent.setClass(this, PDFDownloadActivity.class);
-        if (mCondition.length() == 0) {
+        if (mCondition.length() != 0) {
+            intent.putExtra("condition", mCondition);
+        } else if (!TextUtils.isEmpty(mDefaultCondition)) {
             intent.putExtra("condition", mDefaultCondition);
         } else {
-            intent.putExtra("condition", mCondition);
+            ToastMessage("请确定查询条件!");
+            return;
         }
         if (mReportInfo != null) {
             intent.putExtra("reportName", mReportInfo.getReportName());