Merge remote-tracking branch 'origin/develop' into develop-green

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -184,7 +184,7 @@ public class Order extends Controller {
             } else {
                 sqlFactory.addParameter("billdate", billdate);
             }
-            if (content.containsKey("sa_accountclassid")) {
+            if (content.containsKey("sa_accountclassid")&&!content.getString("sa_accountclassid").equals("")) {
                 sa_accountclassid = content.getLongValue("sa_accountclassid");
                 if (sa_accountclassid <= 0) {
                     return getErrReturnObject().setErrMsg("账户不存在").toString();