Commit d96c927e by 徐高华

test

parent ee334fe6
......@@ -131,6 +131,7 @@ public class GroupChatHmController {
if (!oldResp.isSuccess()) {
return RestResponse.failure(oldResp.getCode(), oldResp.getMessage());
}
List<Long> oldIdList = this.groupChatHmApiService.listHmGroupChatId(loginUser.getWxEnterpriseId(), dto.getChatHmId()).getResult() ;
GroupChatHmDTO oldDTO = oldResp.getResult();
dto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
dto.setEnterpriseId(loginUser.getEnterpriseId());
......@@ -139,7 +140,7 @@ public class GroupChatHmController {
dto.setWxConfigId(oldDTO.getWxConfigId());
ServiceResponse<GroupChatHmDTO> resp = this.groupChatHmApiService.save(dto);
if (resp.isSuccess()) {
String logContent = this.getUpdateLog(oldDTO, dto);
String logContent = this.getUpdateLog(oldDTO, dto,oldIdList);
if (StringUtils.isNotBlank(logContent)) {
GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
......@@ -152,7 +153,7 @@ public class GroupChatHmController {
return RestResponse.failure("1", resp.getMessage());
}
private String getUpdateLog(GroupChatHmDTO oldDTO, GroupChatHmDTO newDTO) {
private String getUpdateLog(GroupChatHmDTO oldDTO, GroupChatHmDTO newDTO,List<Long> oldIdList) {
String wxEnterpriseId = newDTO.getWxEnterpriseId();
String enterpriseId = newDTO.getEnterpriseId();
StringBuilder content = new StringBuilder();
......@@ -167,7 +168,6 @@ public class GroupChatHmController {
String o = null ;
List<Long> newIdList = newDTO.getChatIdList() ;
List<Long> oldIdList = this.groupChatHmApiService.listHmGroupChatId(wxEnterpriseId, oldDTO.getChatHmId()).getResult() ;
Sets.SetView<Long> delView = Sets.difference(Sets.newHashSet(oldIdList), Sets.newHashSet(newIdList));
List<Long> delIdList = delView.stream().collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment