门店调整商品bug修复

src/custom/restcontroller/webmanage/saletool/appointment/Appointment.java

@@ -32,13 +32,17 @@ public class Appointment extends Controller {
 
         String ownertable = content.getStringValue("ownertable");
         String ownerid = content.getStringValue("ownerid");
-        Long shareuserid = 0L;
+        Long shareuserid = content.getLongValue("shareuserid");
         String sharename = "";
         if (!ownertable.isEmpty()) {
-            Rows rows = dbConnect.runSqlQuery("SELECT createuserid,createby from " + ownertable + " WHERE " + ownertable + "id=" + ownerid + " and siteid='" + siteid + "'");
-            if (rows.isNotEmpty()) {
-                shareuserid = rows.get(0).getLong("createuserid");
-                sharename = rows.get(0).getString("createby");
+            if (shareuserid > 0) {
+                sharename=getUser(shareuserid).getString("name");
+            } else {
+                Rows rows = dbConnect.runSqlQuery("SELECT createuserid,createby from " + ownertable + " WHERE " + ownertable + "id=" + ownerid + " and siteid='" + siteid + "'");
+                if (rows.isNotEmpty()) {
+                    shareuserid = rows.get(0).getLong("createuserid");
+                    sharename = rows.get(0).getString("createby");
+                }
             }
         }
 

src/custom/restcontroller/webmanage/saletool/fad/FadGoods.java

@@ -404,7 +404,7 @@ public class FadGoods extends Controller {
         querySQL.setSiteid(siteid);
         querySQL.setWhere(wheresql.replace("[", "(").replace("]", ")"));
         querySQL.setWhere("classid", 2);
-        querySQL.setWhere("t1.isonsale=1 and (t2.isonsale=1 or t2.isonsale is null)");
+        querySQL.setWhere("t1.isonsale=1");
         querySQL.setWhere("canadjust", 1);
         querySQL.setWhere(where.toString());
         querySQL.setOrderBy(pageSorting).setPage(pageSize, pageNumber);