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

src/custom/restcontroller/webmanage/saletool/award/AwardItems.java

@@ -122,8 +122,12 @@ public class AwardItems extends Controller {
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_awarditems")
                 .setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.inner, "sa_award", "t2", "t2.sa_awardid=t1.sa_awardid and t2.siteid=t1.siteid");
         querySQL.setSiteid(siteid);
-        querySQL.setWhere("sa_awardid", sa_awardid);
+        if (systemclient.equals("marketingtool")) {
+            querySQL.setWhere("t2.isonsale", 1);
+        }
+        querySQL.setWhere("t1.sa_awardid", sa_awardid);
         querySQL.setWhere(where.toString());
         querySQL.setOrderBy(pageSorting).setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
@@ -269,6 +273,7 @@ public class AwardItems extends Controller {
 
         return getSucReturnObject().setData(rows).toString();
     }
+
     @API(title = "更新中奖信息", apiversion = R.ID2024052910464202.v1.class)
     public String newApiMethod() throws YosException {
         long sa_awardmxid = content.getLong("sa_awardmxid");

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

@@ -300,7 +300,7 @@ public class Fad extends Controller {
                         JSONArray array = (JSONArray) obj;
                         if (array.size() > 0) {
                             where.append(" or (");
-                            where.append("JSON_CONTAINS(t1.sat_sharematerial_classids,'" + array.get(array.size() - 1) + "')");
+                            where.append("JSON_CONTAINS(t1.sa_fadclassids,'" + array.get(array.size() - 1) + "')");
                             where.append(")");
                         }
                     }