fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java

@@ -55,6 +55,8 @@ public class StaffDTO implements Serializable{
     private Integer superManagerFlag;
     
     private Boolean weixinPush;
+    
+    private long memberCount;
 
     private static final long serialVersionUID = 1L;
 
@@ -261,5 +263,13 @@ public class StaffDTO implements Serializable{
 		this.weixinPush = weixinPush;
 	}
 
+	public long getMemberCount() {
+		return memberCount;
+	}
+
+	public void setMemberCount(long memberCount) {
+		this.memberCount = memberCount;
+	}
+
     
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java

@@ -40,6 +40,7 @@ import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.service.dao.mapper.DepartmentMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanSyncErrorLog;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.service.DepartmentService;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
@@ -542,7 +543,8 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 					}
 				}
 			} catch (Exception e) {
-				
+				TabHaobanSyncErrorLog tab = new TabHaobanSyncErrorLog();
+				//tab.setDataId(dataId);
 			}
 			this.addAllDepartment(list, departmentDTO.getId(), wxEnterpriseId, corpid, contactSecret);
 			this.staffApiService.initWxUser(corpid, contactSecret, wxEnterpriseId, departmentDTO.getId());

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

@@ -137,23 +137,40 @@ public class ClerkController extends WebBaseController{
 		Map<String,StaffDepartmentRelatedDTO> relatedMap = com.gic.commons.util.CollectionUtil.toMap(list, "staffId");
 		List<String> staffIds = list.stream().map(s->s.getStaffId()).collect(Collectors.toList());
 		List<StaffDTO>  resultlist= staffApiService.listByIds(staffIds);
+		DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
+		String storeId = departmentDTO.getRelatedId();
+		int size = 0;
+		if(resultlist != null){
+			size = resultlist.size();
+		}
 		for(StaffDTO dto :resultlist){
-			if(relatedMap.get(dto.getStaffId()) != null){
-				dto.setStaffDepartmentRelatedId(relatedMap.get(dto.getStaffId()).getStaffDepartmentRelatedId());
-				if(org.apache.commons.lang.StringUtils.isNotBlank(relatedMap.get(dto.getStaffId()).getClerkCode())){
+			StaffDepartmentRelatedDTO related = relatedMap.get(dto.getStaffId());
+			if(related != null){
+				dto.setStaffDepartmentRelatedId(related.getStaffDepartmentRelatedId());
+				if(org.apache.commons.lang.StringUtils.isNotBlank(related.getClerkCode())){
 					dto.setBindFlag(1);
-					dto.setClerkCode(relatedMap.get(dto.getStaffId()).getClerkCode());
+					dto.setClerkCode(related.getClerkCode());
+					
+					if(size > 20){
+						ClerkDTO clerk = clerkService.getClerkByClerkCode(departmentDTO.getEnterpriseId(), related.getClerkCode());
+						if(clerk != null){
+							dto.setMemberCount(distributeApiService.getClerkMemberCount(departmentDTO.getEnterpriseId(), clerk.getClerkId(), storeId));
+						}
+					}else{
+						dto.setMemberCount(0);
+					}
 				}else{
 					dto.setBindFlag(0);
+					dto.setMemberCount(0);
 				}
+				
+				
 			}else{
 				dto.setBindFlag(0);
 			}
 		}
 		
 		//查找店长clerkType
-		DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
-		String storeId = departmentDTO.getRelatedId();
 		if(StringUtils.isEmpty(storeId)){
 		}else{
 			String storeClerkCode = "";