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

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmQrcodeMapper.xml

@@ -342,7 +342,7 @@
             and a.wx_enterprise_id = #{wxEnterpriseId}
         </if>
         <if test="null != hmSelect and '' != hmSelect ">
-        	and (a.hm_code=#{hmSelect} or a.name like '%${hmSelect}%' or a.creator_name like '%${hmSelect}%' ) 
+        	and (a.hm_id=#{hmSelect} or a.hm_code=#{hmSelect} or a.name like '%${hmSelect}%' or a.creator_name like '%${hmSelect}%' )
         </if>
         <if test="null != clerkSelect and '' != clerkSelect">
         	and ( a.clerk_id = #{clerkSelect}  or  b.clerk_id = #{clerkSelect} )

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

@@ -186,7 +186,7 @@ public class HmQrcodeController {
                 } else if (hmType == 2) {
                     BasePageInfo basePageInfo = new BasePageInfo();
                     basePageInfo.setPageNum(1);
-                    basePageInfo.setPageNum(1000);
+                    basePageInfo.setPageSize(1000);
                     Page<HmClerkRelationDTO> hmClerkByHmId = hmQrcodeApiService.getHmClerkByHmId(basePageInfo, hmId);
                     List<HmClerkRelationDTO> hmClerkRelationDTOList = hmClerkByHmId.getResult();
                     if (CollectionUtils.isNotEmpty(hmClerkRelationDTOList)) {
@@ -211,6 +211,11 @@ public class HmQrcodeController {
                 if (hmGroupDTO != null) {
                     hmQrcodeListDTO.setHmGroupName(hmGroupDTO.getGroupName());
                 }
+                //if (CollectionUtils.isNotEmpty(storeDTOList)) {
+                //    //门店id去重
+                //    storeDTOList = storeDTOList.stream()
+                //            .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(HmStoreDTO::getStoreId))), ArrayList::new));
+                //}
                 hmQrcodeListDTO.setClerkList(clerkDTOList);
                 hmQrcodeListDTO.setStoreList(storeDTOList);
             }