Merge remote-tracking branch 'origin/developer' into developer

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/BaseSalesController.java

@@ -47,6 +47,9 @@ public class BaseSalesController {
         List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJSON);
         List<Integer> childrenStoreGroupIdList = this.storeSearchUtils.getChildrenStoreGroupIdList(parentId);
         List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId);
+        if(level == null){
+            level = this.storeSearchUtils.getLevel(userId, enterpriseId, searchJSON).getLevel();
+        }
         BaseSalesParamsDTO dto = new BaseSalesParamsDTO();
         dto.setChannel(channel);
         dto.setEnterpriseId(enterpriseId);
@@ -58,12 +61,11 @@ public class BaseSalesController {
         dto.setDate(dateTypeQo.getDate());
         dto.setChildrenStoreGroupIdList(childrenStoreGroupIdList);
         dto.setLevel(level);
+        dto.setSortField(sortField);
+        dto.setSortType(sortType == null ? 1 : sortType);
         dto.setPageNum(pageNum);
         dto.setPageSize(pageSize);
         ServiceResponse<Page<BaseSalesDTO>> response = this.baseSalesApiService.pageBaseSales(dto);
-        if(level == null){
-            level = this.storeSearchUtils.getLevel(userId, enterpriseId, searchJSON).getLevel();
-        }
         BaseSalesVo vo = new BaseSalesVo();
         vo.setPage(this.parseData(response.getResult(), channel, enterpriseId, level));
         dto.setCountType(2);//合计