bug修复

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

@@ -289,8 +289,8 @@ public class Order2 extends Controller {
             return getSucReturnObject().setData(rows).toString();
         }
 
-        ArrayList<Long> sa_orderids= rows.toArrayList("sa_orderid",new ArrayList<>());
-
+        ArrayList<Long> sa_orderids = rows.toArrayList("sa_orderid", new ArrayList<>());
+        sa_orderids.add(-1l);
         SQLFactory sqlFactory = new SQLFactory(this, "订单-查询筛选出的价格");
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter_in("sa_orderid", sa_orderids);
@@ -430,10 +430,10 @@ public class Order2 extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_order", "*")
                 .setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t2", "t2.sa_customersid=t1.sa_customersid and t2.siteid=t1.siteid",
-                "sa_customersid","billno");
+                "sa_customersid", "billno");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t3", "t3.sys_enterpriseid=t2.sys_enterpriseid and t3.siteid=t2.siteid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid and t4.siteid=t1.siteid",
-                "sa_agentsid","agentnum");
+                "sa_agentsid", "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid");
         querySQL.addJoinTable(JOINTYPE.left, "sys_hr", "t6", "t6.hrid=t1.saler_hrid and t6.siteid=t1.siteid");
         querySQL.addJoinTable(JOINTYPE.left, getAmountQuerySQL(), "t7", "t7.sa_orderid = t1.sa_orderid");
@@ -543,10 +543,10 @@ public class Order2 extends Controller {
             row.putIfAbsent("totalop", 0);
             //关键人
             Rows KeyDoctors = KeyDoctorsRowsMap.getOrDefault(String.valueOf(id), new Rows());
-            row.putIfAbsent("keyperson", StringUtils.join(KeyDoctors.toArray("doctorname"),","));
+            row.putIfAbsent("keyperson", StringUtils.join(KeyDoctors.toArray("doctorname"), ","));
             //签约经销商
             Rows signagent = AgentRowsMap.getOrDefault(String.valueOf(id), new Rows());
-            row.putIfAbsent("signagent", StringUtils.join(signagent.toArray("enterprisename"),","));
+            row.putIfAbsent("signagent", StringUtils.join(signagent.toArray("enterprisename"), ","));
             String stagename = row.getString("stagename");
             for (Row stageRow : stageRows) {
                 if (stagename.equals(stageRow.getString("stagename"))) {