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

src/custom/restcontroller/webmanage/saletool/store/StoreHelper.java

@@ -150,6 +150,7 @@ public class StoreHelper extends BaseClass {
                 , "name", "phonenumber", "userid");
         querySQL.addQueryFields("distance", "st_distance_sphere(point(longitude,latitude),point('" + longitude + "','" + latitude + "'))");
         querySQL.setWhere("status", "审核");
+        querySQL.setSiteid(controller.siteid);
         querySQL.setOrderBy("distance");
         Rows rows = querySQL.query();
         if (rows.isNotEmpty()) {
@@ -165,6 +166,7 @@ public class StoreHelper extends BaseClass {
                 , "name", "phonenumber", "userid");
         querySQL.addQueryFields("distance", "st_distance_sphere(point(longitude,latitude),point('" + longitude + "','" + latitude + "'))");
         querySQL.setWhere("status", "审核");
+        querySQL.setSiteid(controller.siteid);
         querySQL.setWhere("sa_storeid", sa_storeid);
         querySQL.setOrderBy("distance");
         Rows rows = querySQL.query();
@@ -183,6 +185,7 @@ public class StoreHelper extends BaseClass {
         querySQL.addQueryFields("distance", "st_distance_sphere(point(longitude,latitude),point('" + longitude + "','" + latitude + "'))");
         querySQL.setWhere("t3.sys_enterprise_hrid", sys_enterprise_hrid);
         querySQL.setWhere("status", "审核");
+        querySQL.setSiteid(controller.siteid);
         querySQL.setOrderBy("distance");
         return querySQL.query();
     }