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

src/custom/restcontroller/webmanage/sale/accountclass/accountclass.java

@@ -91,9 +91,9 @@ public class accountclass extends Controller {
 
                 }
 
-                sqlUpdateFactory.addParameter("accountno", isuserdRows.get(0).getString("accountno"));
-                sqlUpdateFactory.addParameter("accountname", isuserdRows.get(0).getString("accountname"));
-                sqlUpdateFactory.addParameter("isorder", isuserdRows.get(0).getInteger("isorder"));
+                sqlUpdateFactory.addParameter("accountno", accountno);
+                sqlUpdateFactory.addParameter("accountname", accountname);
+                sqlUpdateFactory.addParameter("isorder", isorder);
                 sqlUpdateFactory.addParameter("isused", content.getInteger("isused"));
                 sqlUpdateFactory.addParameter("isrebate", isuserdRows.get(0).getInteger("isrebate"));
                 sqlUpdateFactory.addParameter("maximumdiscount", maximumdiscount);
@@ -157,6 +157,9 @@ public class accountclass extends Controller {
             if (whereObject.containsKey("isused") && !"".equals(whereObject.getString("isused"))) {
                 where = where + " and t1.isused=" + whereObject.getLong("isused");
             }
+            if (whereObject.containsKey("isorder") && !"".equals(whereObject.getString("isorder"))) {
+                where = where + " and t1.isorder=" + whereObject.getLong("isorder");
+            }
             if (whereObject.containsKey("isrebate") && !"".equals(whereObject.getString("isrebate"))) {
                 where = where + " and t1.isrebate=" + whereObject.getLong("isrebate");
             }