|
@@ -50,6 +50,9 @@ public class Store extends Controller {
|
|
|
Rows saleareaRows = dbConnect.runSqlQuery("SELECT sa_saleareaid from sa_salearea_hr WHERE hrid=" + hrid + " and siteid='" + siteid + "'");
|
|
|
ArrayList<Long> sa_saleareaids = saleareaRows.toArrayList("sa_saleareaid", new ArrayList<>());
|
|
|
sa_saleareaids.addAll(SaleArea.getSubSaleAreaIds(this, sa_saleareaids));
|
|
|
+ if (sa_saleareaids.size() == 0) {
|
|
|
+ sa_saleareaids.add(-1L);
|
|
|
+ }
|
|
|
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(controller, "sys_enterprise"
|
|
|
, "sys_enterpriseid", "enterprisename", "contact", "phonenumber", "province", "city", "county", "address")
|
|
@@ -183,9 +186,9 @@ public class Store extends Controller {
|
|
|
Long sa_storeid = content.getLongValue("sa_storeid");
|
|
|
Rows rows;
|
|
|
|
|
|
- if(sa_storeid>0){
|
|
|
- rows = StoreHelper.queryStores(this,sa_storeid, longitude, latitude);
|
|
|
- }else {
|
|
|
+ if (sa_storeid > 0) {
|
|
|
+ rows = StoreHelper.queryStores(this, sa_storeid, longitude, latitude);
|
|
|
+ } else {
|
|
|
if (usertype == 21 || usertype == 22) {
|
|
|
Long sys_enterprise_hrid = getEnterpriseHr(userid).getLong("sys_enterprise_hrid");
|
|
|
rows = StoreHelper.queryAgentsStores(this, sys_enterprise_hrid, longitude, latitude);
|