Merge remote-tracking branch 'origin/feature/202310月零散迭代' into feature/202310月零散迭代

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -695,9 +695,12 @@ public class GroupChatServiceImpl implements GroupChatService {
             if(null != staffId) {
                 List<StaffClerkRelationDTO> staffList = this.staffClerkRelationService.listByStaffId(wxEnterpriseId,staffId) ;
                 if(CollectionUtils.isNotEmpty(staffList)) {
-                    List<String> storeIdList = staffList.stream().filter(o->StringUtils.isNotEmpty(o.getStoreId())).map(o->o.getEnterpriseId()).collect(Collectors.toList()) ;
+                    List<String> storeIdList = staffList.stream().filter(o->StringUtils.isNotEmpty(o.getStoreId())).map(o->o.getStoreId()).collect(Collectors.toList()) ;
                     if(CollectionUtils.isNotEmpty(storeIdList)) {
-                        String[] arr = (String[]) storeIdList.toArray();
+                        String[] arr = new String[storeIdList.size()] ;
+                        for(int i=0;i<storeIdList.size();i++) {
+                           arr[i] = storeIdList.get(i) ;
+                        }
                         List<StoreDTO> storeList = this.storeService.getStores(arr) ;
                         if(CollectionUtils.isNotEmpty(storeList)) {
                            storeName = storeList.stream().map(o->o.getStoreName()).collect(Collectors.joining("、")) ;

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatUserMapper.xml

@@ -241,6 +241,7 @@
 			a.invitor_user_id invitorUserId,
 			a.invitor_user_name invitorUserName ,
 			a.user_quit_time userQuitTime,
+			a.quit_staff_store quitStaffStore ,
 			a.join_scene joinScene,
 			a.join_state joinState 
 			from tab_haoban_group_chat_user a
@@ -305,7 +306,7 @@
 	</select>
 
 	<select id="listQuitNum" resultType="com.gic.haoban.manage.service.pojo.bo.chat.UserQuitBO">
-		select quit_staff_id , count(*) from tab_haoban_group_chat_user where wx_enterprise_id=#{wxEnterpriseId} and user_quit_time >= #{start}
+		select quit_staff_id staffId , count(*) num from tab_haoban_group_chat_user where wx_enterprise_id=#{wxEnterpriseId} and user_quit_time >= #{start}
 		and user_quit_time <![CDATA[<=]]> #{end} and status_flag = 2 group by quit_staff_id
 	</select>