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

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

@@ -876,6 +876,14 @@ public class Order extends Controller {
                     where.append(" and exists(SELECT * from sa_orderitems_change WHERE sa_orderid = t1.sa_orderid and siteid = t1.siteid)");
                 }
             }
+            if (whereObject.containsKey("isnotxinjian") && !"".equals(whereObject.getString("isnotxinjian"))) {
+                String isnotxinjian = whereObject.getStringValue("isnotxinjian");
+                if (isnotxinjian.equals("1")) {
+                    where.append(" and t1.status !='新建' ");
+                } else {
+                    where.append(" and t1.status ='新建' ");
+                }
+            }
         }