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

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

@@ -204,6 +204,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 					staffClerkRelation.setStoreId(tab.getCommitStoreId());
 					staffClerkRelation.setWxEnterpriseId(tab.getWxEnterpriseId());
 					staffClerkRelation.setWxUserId(obj.getWxUserId());
+					staffClerkRelation.setStaffId(obj.getStaffId());
 					staffClerkRelationApiService.insert(staffClerkRelation);
 				}
 			}

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

@@ -223,6 +223,7 @@ public class AuditController extends WebBaseController{
 						staffClerkRelation.setStoreId(storeId);
 						staffClerkRelation.setWxEnterpriseId(wxEnterpriseId);
 						staffClerkRelation.setWxUserId(wxUserId);
+						staffClerkRelation.setStaffId(staffId);
 						staffClerkRelationApiService.insert(staffClerkRelation);
 						audit.setAuditStatus(1);
 						//发送消息

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

@@ -115,15 +115,16 @@ public class ClerkController extends WebBaseController{
 		List<StaffClerkRelationDTO> list = staffClerkRelationApiService.listByStoreId(storeId);
 		List<String> staffIds = list.stream().map(s->s.getStaffId()).collect(Collectors.toList());
 		List<StaffDTO>  resultlist= staffApiService.listByIds(staffIds);
-		Map<String,StaffClerkRelationDTO> map = com.gic.commons.util.CollectionUtil.toMap(list, "staffId");
+		Map<String,StaffDTO> map = com.gic.commons.util.CollectionUtil.toMap(resultlist, "staffId");
 		int size = 0;
 		if(resultlist != null){
 			size = resultlist.size();
 		}
-		for(StaffDTO dto :resultlist){
-			StaffClerkRelationDTO staffClerkRelationDTO = map.get(dto.getStaffId());
-			dto.setClerkCode(staffClerkRelationDTO.getClerkCode());
-			dto.setClerkId(staffClerkRelationDTO.getClerkId());
+		
+		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){
@@ -136,6 +137,7 @@ public class ClerkController extends WebBaseController{
 			}else{
 				dto.setMemberCount(0);
 			}
+			resultList.add(dto);
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,resultlist);