门店列表查询接口调整

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -177,7 +177,14 @@ public class StoreController extends DownloadUtils {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
         storeSearchDTO.setEnterpriseId(enterpriseId);
-        storeSearchDTO.setStoreResource(UserDetailUtils.getUserDetail().getStoreResourceId());
+
+        List<Integer> storeResourceList = new ArrayList<>();
+        if (UserDetailUtils.getUserDetail().getStoreResourceId() != null) {
+            storeResourceList.add(UserDetailUtils.getUserDetail().getStoreResourceId().intValue());
+        }
+        if (storeSearchDTO.getStoreResource() != null) {
+            storeResourceList.add(storeSearchDTO.getStoreResource().intValue());
+        }
 
         //门店标签
         ServiceResponse<StoreTagDTO> storeTagResult = storeTagApiService.getByStoreTagId(storeSearchDTO.getStoreTagId());