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

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

@@ -165,10 +165,12 @@ public class ClerkController extends WebBaseController{
 					dto.setBindFlag(1);
 					dto.setClerkCode(related.getClerkCode());
 					
-					if(size > 20){
+					if(size < 20){
 						ClerkDTO clerk = clerkService.getClerkByClerkCode(departmentDTO.getEnterpriseId(), related.getClerkCode());
 						if(clerk != null){
-							dto.setMemberCount(distributeApiService.getClerkMemberCount(departmentDTO.getEnterpriseId(), clerk.getClerkId(), storeId));
+							long memberCount = distributeApiService.getClerkMemberCount(departmentDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
+							logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},count={}",departmentDTO.getEnterpriseId(),clerk.getClerkId(),storeId,memberCount);
+							dto.setMemberCount(memberCount);
 						}
 					}else{
 						dto.setMemberCount(0);