Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/MaidianDataController.java

@@ -327,7 +327,7 @@ public class MaidianDataController extends WebBaseController {
         }
         if (StringUtils.isEmpty(paramsDTO.getSortType())) {
             paramsDTO.setSortType("desc");
-        }·
+        }
         paramsDTO.setAreaType("store");
         Map<String, Object> returnMap = new HashMap<String, Object>();
         Page<AreaLoginDTO> page = maidianDataService.areaRankingList(paramsDTO);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java

@@ -140,12 +140,16 @@ public class HmQrcodeController {
         if (CollectionUtils.isEmpty(storeList)) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_100007.getCode()), HaoBanErrCode.ERR_100007.getMsg());
         }
-
         if (!storeList.contains("-1")) {
             StringBuffer stringBuffer = new StringBuffer();
             storeList.forEach(c -> stringBuffer.append(c).append(","));
             hmQrcodeListQO.getInFields().setStoreId(stringBuffer.toString());
         }
+        Long hmGroupId = hmQrcodeListQO.getInFields().getHmGroupId();
+        //-1 代表全部分组
+        if (hmGroupId == -1) {
+            hmQrcodeListQO.getInFields().setHmGroupId(null);
+        }
         HmQrcodeListQDTO qdto = EntityUtil.changeEntityByJSON(HmQrcodeListQDTO.class, hmQrcodeListQO.getInFields());
         if (!storeList.contains("-1")) {
             qdto.setStoreId(storeList);
@@ -208,6 +212,7 @@ public class HmQrcodeController {
                 hmQrcodeListDTO.setClerkList(clerkDTOList);
                 hmQrcodeListDTO.setStoreList(storeDTOList);
             }
+            statisticsDTO.setData(data);
         }
         return RestResponse.successResult(statisticsDTO);
     }