log

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

@@ -110,8 +110,8 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
     @Override
     public GroupChatHmBO getById(Long hmId) {
         TabGroupChatHm hm = this.groupChatHmMapper.selectById(hmId);
-        if(null == hm) {
-            return null ;
+        if (null == hm) {
+            return null;
         }
         this.updateLinkCount(hm.getWxEnterpriseId(), hmId);
         GroupChatHmBO bo = EntityUtil.changeEntityByJSON(GroupChatHmBO.class, hm);
@@ -294,9 +294,10 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
             joinDTO.setConfig_id(hm.getWxConfigId());
             ServiceResponse<Void> updateResp = this.qywxChatApiService.updateJoinWay(qwDTO.getDkCorpid(),
                     secretSetting.getSecretVal(), joinDTO);
-            if (updateResp.isSuccess()) {
-                this.groupChatHmMapper.updateById(hm);
+            if (!updateResp.isSuccess()) {
+                return updateResp.getMessage();
             }
+            this.groupChatHmMapper.updateById(hm);
             List<TabGroupChatHmRelation> oldList = this.groupChatHmRelationMapper.listByChatHmId(hmid);
             List<Long> oldIdList = oldList.stream().map(o -> o.getGroupChatId()).collect(Collectors.toList());
             List<Long> newIdList = dto.getChatIdList();

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

@@ -128,6 +128,7 @@ public class GroupChatHmController {
         dto.setEnterpriseId(loginUser.getEnterpriseId());
         dto.setModifierId(loginUser.getClerkId());
         dto.setModifierName(loginUser.getClerkName());
+        dto.setWxConfigId(oldDTO.getWxConfigId());
         ServiceResponse<GroupChatHmDTO> resp = this.groupChatHmApiService.save(dto);
         if (resp.isSuccess()) {
             String logContent = this.getUpdateLog(oldDTO, dto);
@@ -138,6 +139,7 @@ public class GroupChatHmController {
             GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             return RestResponse.successResult();
         }
+        GicLogRecordEvaluationContext.noWriteLog();
         return RestResponse.failure("1", resp.getMessage());
     }