111

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

@@ -124,20 +124,14 @@ public class ClerkController extends WebBaseController{
 		List<StaffDTO> resultList = new ArrayList<>();
 		for(StaffClerkRelationDTO staffClerkRelationDTO : list){
 			StaffDTO dto = map.get(staffClerkRelationDTO.getStaffId());
-			
-			if(size < 20){
-				ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
-				if(clerk != null){
-					long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
-					logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},count={}",staffClerkRelationDTO.getEnterpriseId(),clerk.getClerkId(),storeId,memberCount);
-					dto.setMemberCount(memberCount);
-				}else{
-					dto.setMemberCount(0);
-				}
-			}else{
-				dto.setMemberCount(0);
+			ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
+			if(clerk != null){
+				long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
+				logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},count={}",staffClerkRelationDTO.getEnterpriseId(),clerk.getClerkId(),storeId,memberCount);
+				dto.setMemberCount(memberCount);
+				dto.setClerkId(clerk.getClerkId());
+				resultList.add(dto);
 			}
-			resultList.add(dto);
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,resultlist);
 		
@@ -258,6 +252,9 @@ public class ClerkController extends WebBaseController{
 	@HttpLimit
 	@RequestMapping("/staff-del")
 	public HaobanResponse staffDel(String wxEnterpriseId,String storeId,Integer version,String clerkIds,String staffId) {
+		if(StringUtils.isAnyBlank(clerkIds)) {
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
 		AuditSettingDTO dto = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
 		if(dto.getClerkChangeFlag() == 1){
 			//需要审核