历任群主

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

@@ -584,8 +584,17 @@ public class GroupChatServiceImpl implements GroupChatService {
     }
 
     @Override
-    public List<GroupChatOwnerHistoryDTO> listOwnerHistory(Long groupChatId , String WxEnterpriseId) {
-        List<GroupChatOwnerHistoryDTO> list = this.groupChatOwnerHistoryMapper.listAll(groupChatId,WxEnterpriseId);
+    public List<GroupChatOwnerHistoryDTO> listOwnerHistory(Long groupChatId, String WxEnterpriseId) {
+        TabGroupChat chat = this.groupChatMapper.selectById(groupChatId);
+        if (null == chat || org.apache.commons.lang3.StringUtils.isEmpty(chat.getStaffId())) {
+            return null;
+        }
+        List<GroupChatOwnerHistoryDTO> list = this.groupChatOwnerHistoryMapper.listAll(groupChatId, WxEnterpriseId);
+        for (GroupChatOwnerHistoryDTO item : list) {
+            if (chat.getStaffId().equals(item.getStaffId())) {
+                item.setEndTime(null);
+            }
+        }
         return list;
     }
 }
\ No newline at end of file

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

@@ -49,6 +49,6 @@
   
   <select id="listAll" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO">
   	 select a.staff_id staffId , b.staff_name staffName , a.create_time createTime , a.end_time endTime  from tab_haoban_group_chat_owner_history  a LEFT JOIN tab_haoban_staff b on a.staff_id = b.staff_id
-  	 where a.group_chat_id=#{groupChatId} and a.wx_enterprise_id=#{wxEnterpriseId}
+  	 where a.group_chat_id=#{groupChatId} and a.wx_enterprise_id=#{wxEnterpriseId} order by a.create_time desc
   </select>
 </mapper> 
\ No newline at end of file