操作日志

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatOwnerHistoryMapper.java

@@ -20,6 +20,8 @@ public interface GroupChatOwnerHistoryMapper {
 
     public int insert(TabGroupChatOwnerHistory entity);
     
+    public TabGroupChatOwnerHistory getGroupChatNowStaff(@Param("groupChatId") Long groupChatId, @Param("staffId") String staffId) ;
+
     public int updateOwnerEnd(@Param("groupChatId") Long groupChatId, @Param("staffId") String staffId);
 
     public List<GroupChatOwnerHistoryDTO> listAll(@Param("groupChatId")Long groupChatId,@Param("wxEnterpriseId") String wxEnterpriseId);

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

@@ -475,6 +475,7 @@ public class GroupChatServiceImpl implements GroupChatService {
 
     private void updateGroupChatDetail(WxEnterpriseQwDTO qwDTO, TabGroupChat chat, boolean syncMember) {
         // 控制同时刷新
+
         Long groupChatId = chat.getGroupChatId();
         String wxEnterpriseId = chat.getWxEnterpriseId();
         String enterpriseId = chat.getEnterpriseId();
@@ -671,6 +672,9 @@ public class GroupChatServiceImpl implements GroupChatService {
             return;
         }
         if (null != newStaffId) {
+            if (null != this.groupChatOwnerHistoryMapper.getGroupChatNowStaff(groupChatId, newStaffId)) {
+                return;
+            }
             TabGroupChatOwnerHistory entity = new TabGroupChatOwnerHistory();
             entity.setOwnerHistoryId(UniqueIdUtils.uniqueLong());
             entity.setWxEnterpriseId(wxEnterpriseId);

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

@@ -38,12 +38,17 @@
   ]]>
   </insert>
   
+  <select id="getGroupChatNowStaff" resultMap="result-map-tabHaobanGroupChatOwnerHistory">
+  	select <include refid="Base_Column_List" /> from tab_haoban_group_chat_owner_history
+  	where group_chat_id=#{groupChatId} and staff_id=#{staffId} and end_time is null 
+  </select>
+  
    <!-- ==================更新 ========== -->
   <update id="updateOwnerEnd">
   <![CDATA[
   UPDATE tab_haoban_group_chat_owner_history SET
 	  end_time= now() 
-  where group_chat_id=#{groupChatId} and 
+  where group_chat_id=#{groupChatId} and staff_id=#{staffId}
   ]]>
   </update>
   

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatHmController.java

@@ -137,7 +137,7 @@ public class GroupChatHmController {
             if (StringUtils.isNotBlank(logContent)) {
                 GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
                 GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
-            }else {
+            } else {
                 GicLogRecordEvaluationContext.noWriteLog();
             }
             return RestResponse.successResult();
@@ -168,15 +168,19 @@ public class GroupChatHmController {
             d = "开启自动建群功能【" + newDTO.getRoomBaseName() + newDTO.getRoomBaseId() + "】";
             content.append(d);
         }
-        String e = comp(wxEnterpriseId, enterpriseId, "群名前缀", oldDTO.getRoomBaseName(), newDTO.getRoomBaseName(), 0);
+        String e = null;
+        String f = null;
+        if (null == c && d == null) {
+            e = comp(wxEnterpriseId, enterpriseId, "群名前缀", oldDTO.getRoomBaseName(), newDTO.getRoomBaseName(), 0);
             if (null != e) {
                 content.append(e);
             }
-        String f = comp(wxEnterpriseId, enterpriseId, "群起始序号", oldDTO.getRoomBaseId() + "", newDTO.getRoomBaseId() + "",
+            f = comp(wxEnterpriseId, enterpriseId, "群起始序号", oldDTO.getRoomBaseId() + "", newDTO.getRoomBaseId() + "",
                     0);
             if (null != f) {
                 content.append(f);
             }
+        }
         if (org.apache.commons.lang3.StringUtils.isAllBlank(a, b, c, d, e, f)) {
             return null;
         }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatPlanController.java

@@ -250,8 +250,8 @@ public class GroupChatPlanController {
         String f = null;
         if (!oldDTO.getExpireDays().equals(newDTO.getExpireDays())) {
             StringBuilder sb = new StringBuilder();
-            sb.append("结束时间").append("「").append(oldDTO.getExpireDays()).append("天后,").append("").append("」变更为「")
-                    .append(newDTO.getExpireDays()).append("天后,").append("").append("」");
+            sb.append("结束时间").append("「").append(oldDTO.getExpireDays()).append("天后").append("").append("」变更为「")
+                    .append(newDTO.getExpireDays()).append("天后").append("").append("」");
             f = sb.toString();
             content.append(f);
         }